diff --git a/examples/l2tp.nix b/examples/l2tp.nix index 169e62f..e07fc46 100644 --- a/examples/l2tp.nix +++ b/examples/l2tp.nix @@ -36,22 +36,18 @@ in rec { username = "user"; password = "one2one"; authType = "chap"; - }; - - services.dhcpc = svc.network.dhcp.client.build { - interface = config.services.wwan; dependencies = [ config.services.hostname ]; }; services.sshd = svc.ssh.build { }; services.resolvconf = oneshot rec { - dependencies = [ services.dhcpc ]; + dependencies = [ services.wwan ]; name = "resolvconf"; up = '' . ${serviceFns} ( in_outputs ${name} - for i in $(output ${services.dhcpc} dns); do + for i in $(output ${services.wwan} dns); do echo "nameserver $i" > resolv.conf done ) diff --git a/modules/cdc-ncm/wwan.nix b/modules/cdc-ncm/wwan.nix index adf4f4a..b65d460 100644 --- a/modules/cdc-ncm/wwan.nix +++ b/modules/cdc-ncm/wwan.nix @@ -53,6 +53,7 @@ let }; symlink = "/dev/modem"; }); + # XXX need an ip-up script here to collect the IP address up = '' ls -l /dev/modem test -L /dev/modem || exit 1