ecoppens/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 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

7
modules/ppp/pppoe.nix
View file

@ -9,7 +9,7 @@
{ interface, ppp-options }:
let
inherit (liminix.services) longrun;
name = "${interface.device}.pppoe";
name = "${interface.name}.pppoe";
ip-up = writeAshScript "ip-up" {} ''
. ${serviceFns}
(in_outputs ${name}
@ -42,7 +42,10 @@ let
in
longrun {
inherit name;
run = "${ppp}/bin/pppd pty '${pppoe}/bin/pppoe -I ${interface.device}' ${lib.concatStringsSep " " ppp-options'}" ;
run = ''
. ${serviceFns}
${ppp}/bin/pppd pty "${pppoe}/bin/pppoe -I $(output ${interface} ifname)" ${lib.concatStringsSep " " ppp-options'}
'';
notification-fd = 10;
dependencies = [ interface ];
}