liminix

commit adc84108ad374082c6a567961bccc08515d15269
parent eae99051fa758a7c6889735fd9c1558d78aa15c1
Author: Daniel Barlow <dan@telent.net>
Date:   Sat, 15 Jun 2024 15:04:33 +0100

Revert "wwan gets address from ppp ipcp not dhcp"

This reverts commit be13ab23ca2f31189c79d5edfbc62f5ae8781ed3.

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

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/examples/l2tp.nix b/examples/l2tp.nix
@@ -36,18 +36,22 @@ 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.wwan ];
+    dependencies = [ services.dhcpc ];
     name = "resolvconf";
     up = ''
       . ${serviceFns}
       ( in_outputs ${name}
-      for i in $(output ${services.wwan} dns); do
+      for i in $(output ${services.dhcpc} dns); do
         echo "nameserver $i" > resolv.conf
       done
       )
diff --git a/modules/cdc-ncm/wwan.nix b/modules/cdc-ncm/wwan.nix
@@ -53,7 +53,6 @@ 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