HackENS/liminix-fork
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove interface.device

Browse source 
build-time uses can mostly be replaced with interface.name

for runtime uses, switch to $(output ${interface} name)
This commit is contained in:
Daniel Barlow 2023-08-27 23:20:58 +01:00
parent 6da0e67621
commit 540a1dfd76
6 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/bridge/service.nix
View file

@ -13,14 +13,15 @@ let
type = "bridge";
};
addif = member :
oneshot {
name = "add-${member.device}-to-br-${primary.device}";
up = "${ifwait}/bin/ifwait ${member.device} running && ip link set dev ${member.device} master ${primary.device}";
down = "ip link set dev ${member.device} nomaster";
let ifname = "$(output ${member} ifname)";
in oneshot {
name = "add-${member.name}-to-br-${primary.name}";
up = "${ifwait}/bin/ifwait ${ifname} running && ip link set dev ${ifname} master $(output ${primary} ifname)";
down = "ip link set dev ${ifname} nomaster";
dependencies = [ primary member ];
};
in (bundle {
name = "bridge-${primary.device}-members";
in bundle {
name = "bridge-${primary.name}-members";
contents = [ primary ] ++ map addif members;
}) // { device = primary.device; }
}