liminix

commit d9f91e48201917086cc93362ce911ee67956c765
parent 46dcf71e1610806ca6dd7250dd1f773acbea8ce2
Author: Daniel Barlow <dan@telent.net>
Date:   Tue,  4 Nov 2025 20:42:23 +0000

update examples for dhcp4c rename

Diffstat:
M
examples/arhcive.nix
 | 
3
++-
M
examples/hello-from-mt300.nix
 | 
3
++-
M
examples/nwa50ax-ap.nix
 | 
3
++-
M
examples/recovery.nix
 | 
3
++-
M
examples/router-with-l2tp.nix
 | 
4
+++-
M
examples/turris.nix
 | 
9
+++++----
M
vanilla-configuration.nix
 | 
3
++-

7 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/examples/arhcive.nix b/examples/arhcive.nix
@@ -33,6 +33,7 @@ rec {
     ../modules/usb.nix
     ../modules/watchdog
     ../modules/mount
+    ../modules/dhcp4c
   ];
   hostname = "arhcive";
 
@@ -40,7 +41,7 @@ rec {
     let
       iface = config.hardware.networkInterfaces.lan;
     in
-    svc.network.dhcp.client.build {
+    svc.dhcp4c.client.build {
       interface = iface;
       dependencies = [ config.services.hostname ];
     };
diff --git a/examples/hello-from-mt300.nix b/examples/hello-from-mt300.nix
@@ -5,6 +5,7 @@ let
 in
 rec {
   imports = [
+    ../modules/dhcp4c
     ../modules/network
     ../modules/ssh
     ../modules/vlan
@@ -20,7 +21,7 @@ rec {
 
   hostname = "hello";
 
-  services.dhcpc = svc.network.dhcp.client.build {
+  services.dhcpc = svc.dhcp4c.client.build {
     interface = config.hardware.networkInterfaces.lan;
 
     # don't start DHCP until the hostname is configured,
diff --git a/examples/nwa50ax-ap.nix b/examples/nwa50ax-ap.nix
@@ -61,6 +61,7 @@ rec {
     ../modules/ntp
     ../modules/vlan
     ../modules/bridge
+    ../modules/dhcp4c
   ];
 
   hostname = "zyxel";
@@ -93,7 +94,7 @@ rec {
     let
       iface = services.int;
     in
-    svc.network.dhcp.client.build { interface = iface; };
+    svc.dhcp4c.client.build { interface = iface; };
 
   services.defaultroute4 = svc.network.route.build {
     via = "$(output ${services.dhcpv4} address)";
diff --git a/examples/recovery.nix b/examples/recovery.nix
@@ -28,6 +28,7 @@ rec {
     ../modules/outputs/ubimage.nix
     ../modules/outputs/jffs2.nix
     ../modules/outputs/ext4fs.nix
+    ../modules/dhcp4c
   ];
 
   kernel.config = {
@@ -43,7 +44,7 @@ rec {
 
   hostname = "liminix-recovery";
 
-  services.dhcpc = svc.network.dhcp.client.build {
+  services.dhcpc = svc.dhcp4c.client.build {
     interface = config.hardware.networkInterfaces.lan2;
 
     # don't start DHCP until the hostname is configured,
diff --git a/examples/router-with-l2tp.nix b/examples/router-with-l2tp.nix
@@ -62,6 +62,8 @@ rec {
     ../modules/health-check
     ../modules/secrets
     ../modules/profiles/gateway.nix
+    ../modules/dhcp4c
+
   ];
   hostname = "thing";
 
@@ -201,7 +203,7 @@ rec {
     };
   };
 
-  services.bootstrap-dhcpc = svc.network.dhcp.client.build {
+  services.bootstrap-dhcpc = svc.dhcp4c.client.build {
     interface = config.services.wwan;
     dependencies = [ config.services.hostname ];
   };
diff --git a/examples/turris.nix b/examples/turris.nix
@@ -16,9 +16,10 @@ rec {
     ../modules/wlan.nix
     ../modules/hostapd
     ../modules/bridge
+    ../modules/dhcp4c
 
-    ../modules/ext4fs.nix
-    ../modules/tftpboot.nix
+    ../modules/outputs/ext4fs.nix
+    ../modules/outputs/tftpboot.nix
   ];
 
   rootfsType = "ext4";
@@ -29,7 +30,7 @@ rec {
     # then these dummy values are fine
     ipaddr = "10.0.0.8"; # my address
     serverip = "10.0.0.1"; # build machine or other tftp server
-    loadAddress = lim.parseInt "0x40000800";
+    #    loadAddress = lim.parseInt "0x40000800";
   };
 
   hostname = "omnia";
@@ -91,7 +92,7 @@ rec {
     ifname = "int";
   };
 
-  services.dhcpc = svc.network.dhcp.client.build {
+  services.dhcpc = svc.dhcp4c.client.build {
     interface = services.int;
     dependencies = [ config.services.hostname ];
   };
diff --git a/vanilla-configuration.nix b/vanilla-configuration.nix
@@ -9,13 +9,14 @@ rec {
     ./modules/network
     ./modules/ntp
     ./modules/vlan
+    ../modules/dhcp4c
   ];
 
   services.dhcpv4 =
     let
       iface = svc.network.link.build { ifname = "eth1"; };
     in
-    svc.network.dhcp.client.build { interface = iface; };
+    svc.dhcp4c.client.build { interface = iface; };
 
   services.defaultroute4 = svc.network.route.build {
     via = "$(output ${services.dhcpv4} ip)";