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

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

@ -25,18 +25,14 @@ in {
up = lib.concatStringsSep "\n" ups;
down = "ip link set down dev ${device}";
dependencies = dependencies ++ lib.optional (primary != null) primary;
} // {
inherit device;
};
address = interface: { family, dependencies ? [], prefixLength, address } @ args:
let inherit (builtins) toString;
in oneshot {
dependencies = [ interface ] ++ dependencies;
name = "${interface.device}.addr.${address}";
up = "ip address add ${address}/${toString prefixLength} dev ${interface.device} ";
down = "ip address del ${address}/${toString prefixLength} dev ${interface.device} ";
} // {
inherit (interface) device;
name = "${interface.name}.addr.${address}";
up = "ip address add ${address}/${toString prefixLength} dev $(output ${interface} ifname)";
down = "ip address del ${address}/${toString prefixLength} dev $(output ${interface} ifname)";
};
route = { name, target, via, dependencies, dev ? null }:
let with_dev = if dev != null then "dev ${dev}" else "";