liminix

commit be13ab23ca2f31189c79d5edfbc62f5ae8781ed3
parent 4b30cd7a75e84c5d54c5e946baeea785760e7ed5
Author: Daniel Barlow <dan@telent.net>
Date:   Wed, 12 Jun 2024 12:51:07 +0100

wwan gets address from ppp ipcp not dhcp

Diffstat:
M
examples/l2tp.nix
 | 
8
++------
M
modules/cdc-ncm/wwan.nix
 | 
1
+

2 files changed, 3 insertions(+), 6 deletions(-)
diff --git 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
@@ -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