DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

improve bridge support

Browse source 
instead of a bridge specifiying its members (not ideal if they're
not all always up), the member interfaces specify their primary
This commit is contained in:
Daniel Barlow 2023-02-24 23:49:05 +00:00
parent 8194e909ac
commit 3b75cadb20
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/liminix-tools/networking/default.nix
View file

@ -1,14 +1,25 @@
{ {
callPackage callPackage
, liminix , liminix
, lib
}: }:
let inherit (liminix.services) oneshot longrun; let
inherit (liminix.services) oneshot longrun;
inherit (lib) concatStringsSep optional;
in { in {
interface = { type, device, dependencies ? [] } @ args: oneshot { interface = { type, device, primary ? null, dependencies ? [] } @ args:
let ups =
[]
++ optional (type == "bridge")
"ip link add name ${device} type bridge"
++ ["ip link set up dev ${device}"]
++ optional (primary != null)
"ip link set dev ${device} master ${primary.device}";
in oneshot {
name = "${device}.link"; name = "${device}.link";
up = "ip link set up dev ${device}"; up = lib.concatStringsSep "\n" ups;
down = "ip link set down dev ${device}"; down = "ip link set down dev ${device}";
inherit dependencies; dependencies = dependencies ++ lib.optional (primary != null) primary;
} // { } // {
inherit device; inherit device;
}; };