dan/liminix
1
0
Fork 5
Code

wwan gets address from ppp ipcp not dhcp

Browse Source
This commit is contained in:
Daniel Barlow 2024-06-12 12:51:07 +01:00
parent 4b30cd7a75
commit be13ab23ca
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/l2tp.nix
View File

@ -36,22 +36,18 @@ in rec {
username = "user"; username = "user";
password = "one2one"; password = "one2one";
authType = "chap"; authType = "chap";
};
services.dhcpc = svc.network.dhcp.client.build {
interface = config.services.wwan;
dependencies = [ config.services.hostname ]; dependencies = [ config.services.hostname ];
}; };
services.sshd = svc.ssh.build { }; services.sshd = svc.ssh.build { };
services.resolvconf = oneshot rec { services.resolvconf = oneshot rec {
dependencies = [ services.dhcpc ]; dependencies = [ services.wwan ];
name = "resolvconf"; name = "resolvconf";
up = '' up = ''
. ${serviceFns} . ${serviceFns}
( in_outputs ${name} ( in_outputs ${name}
for i in $(output ${services.dhcpc} dns); do for i in $(output ${services.wwan} dns); do
echo "nameserver $i" > resolv.conf echo "nameserver $i" > resolv.conf
done done
) )

1
modules/cdc-ncm/wwan.nix
View File

@ -53,6 +53,7 @@ let
}; };
symlink = "/dev/modem"; symlink = "/dev/modem";
}); });
# XXX need an ip-up script here to collect the IP address
up = '' up = ''
ls -l /dev/modem ls -l /dev/modem
test -L /dev/modem || exit 1 test -L /dev/modem || exit 1