remove interface.device

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

View File

@@ -14,7 +14,7 @@
, resolvconf
}:
let
name = "${interface.device}.dnsmasq";
name = "${interface.name}.dnsmasq";
inherit (liminix.services) longrun;
inherit (lib) concatStringsSep;
in
@@ -27,7 +27,7 @@ longrun {
--user=${user} \
--domain=${domain} \
--group=${group} \
--interface=${interface.device} \
--interface=$(output ${interface} ifname) \
${lib.concatStringsSep " " (builtins.map (r: "--dhcp-range=${r}") ranges)} \
${lib.concatStringsSep " " (builtins.map (r: "--server=${r}") upstreams)} \
--keep-in-foreground \