From e577caa15f14c94818f1da699ff058275f95c4dc Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Thu, 31 Aug 2023 18:29:45 +0100 Subject: [PATCH] extneder: use bridge module --- examples/extneder.nix | 6 +++--- modules/bridge/primary.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/extneder.nix b/examples/extneder.nix index 7ed8fd5..51bba71 100644 --- a/examples/extneder.nix +++ b/examples/extneder.nix @@ -31,6 +31,7 @@ in rec { imports = [ ../modules/wlan.nix + ../modules/vlan ../modules/network ../modules/hostapd ../modules/bridge @@ -88,9 +89,8 @@ in rec { }; }; - services.int = interface { - type = "bridge"; - device = "int"; + services.int = svc.bridge.primary.build { + ifname = "int"; }; services.dhcpc = svc.network.dhcp.client.build { diff --git a/modules/bridge/primary.nix b/modules/bridge/primary.nix index bd07d94..c25e5fe 100644 --- a/modules/bridge/primary.nix +++ b/modules/bridge/primary.nix @@ -5,7 +5,6 @@ }: { ifname } : let - inherit (liminix.networking) interface; inherit (liminix.services) bundle oneshot; inherit (lib) mkOption types; in oneshot rec {