summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorGabriel Wicki <gabriel@erlikon.ch>2025-07-21 19:18:37 +0200
committerGabriel Wicki <gabriel@erlikon.ch>2025-07-24 18:46:06 +0200
commitaea73f5b742c8c36b97c2947f1e7e4ee3a2a3039 (patch)
tree205b96f039ceca8b4c360ba5243dca86fe0bbb8c /gnu/system
parentdfc22bad2628036ece432c39a3b310db1f872677 (diff)
gnu: system: Replace deprecated dhcp client service.
* gnu/system/examples/asus-c201.tmpl, gnu/system/examples/bare-bones.tmpl, gnu/system/examples/beaglebone-black.tmpl, gnu/system/examples/raspberry-pi-64-nfs-root.tmpl, gnu/system/examples/raspberry-pi-64.tmpl, gnu/system/examples/vm-image.tmpl gnu/system/images/orangepi-r1-plus-lts-rk3328.scm, gnu/system/images/pine64.scm, gnu/system/images/rock64.scm, gnu/system/images/unmatched.scm, gnu/system/images/visionfive2.scm, gnu/system/linux-container.scm (services): Replace dhcp-client-service-type with its replacement dhcpcd-service-type. Change-Id: Ib1f31d0a95dfa8ee64cf8c10d617ee53c8637b26
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/examples/asus-c201.tmpl2
-rw-r--r--gnu/system/examples/bare-bones.tmpl2
-rw-r--r--gnu/system/examples/beaglebone-black.tmpl2
-rw-r--r--gnu/system/examples/raspberry-pi-64-nfs-root.tmpl2
-rw-r--r--gnu/system/examples/raspberry-pi-64.tmpl2
-rw-r--r--gnu/system/examples/vm-image.tmpl2
-rw-r--r--gnu/system/images/orangepi-r1-plus-lts-rk3328.scm2
-rw-r--r--gnu/system/images/pine64.scm2
-rw-r--r--gnu/system/images/rock64.scm2
-rw-r--r--gnu/system/images/unmatched.scm2
-rw-r--r--gnu/system/images/visionfive2.scm2
-rw-r--r--gnu/system/linux-container.scm2
12 files changed, 12 insertions, 12 deletions
diff --git a/gnu/system/examples/asus-c201.tmpl b/gnu/system/examples/asus-c201.tmpl
index 019111c1674..69790b89516 100644
--- a/gnu/system/examples/asus-c201.tmpl
+++ b/gnu/system/examples/asus-c201.tmpl
@@ -54,7 +54,7 @@
54 54
55 ;; Add services to the baseline: a DHCP client and 55 ;; Add services to the baseline: a DHCP client and
56 ;; an SSH server. 56 ;; an SSH server.
57 (services (append (list (service dhcp-client-service-type) 57 (services (append (list (service dhcpcd-service-type)
58 (service openssh-service-type 58 (service openssh-service-type
59 (openssh-configuration 59 (openssh-configuration
60 (port-number 2222)))) 60 (port-number 2222))))
diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl
index 7b6a4b09b05..6493855a082 100644
--- a/gnu/system/examples/bare-bones.tmpl
+++ b/gnu/system/examples/bare-bones.tmpl
@@ -47,7 +47,7 @@
47 47
48 ;; Add services to the baseline: a DHCP client and an SSH 48 ;; Add services to the baseline: a DHCP client and an SSH
49 ;; server. You may wish to add an NTP service here. 49 ;; server. You may wish to add an NTP service here.
50 (services (append (list (service dhcp-client-service-type) 50 (services (append (list (service dhcpcd-service-type)
51 (service openssh-service-type 51 (service openssh-service-type
52 (openssh-configuration 52 (openssh-configuration
53 (openssh openssh-sans-x) 53 (openssh openssh-sans-x)
diff --git a/gnu/system/examples/beaglebone-black.tmpl b/gnu/system/examples/beaglebone-black.tmpl
index 18bbb2723c4..007c2707139 100644
--- a/gnu/system/examples/beaglebone-black.tmpl
+++ b/gnu/system/examples/beaglebone-black.tmpl
@@ -45,7 +45,7 @@
45 ;; Globally-installed packages. 45 ;; Globally-installed packages.
46 (packages (append (list screen openssh) %base-packages)) 46 (packages (append (list screen openssh) %base-packages))
47 47
48 (services (append (list (service dhcp-client-service-type) 48 (services (append (list (service dhcpcd-service-type)
49 ;; mingetty does not work on serial lines. 49 ;; mingetty does not work on serial lines.
50 ;; Use agetty with board-specific serial parameters. 50 ;; Use agetty with board-specific serial parameters.
51 (service agetty-service-type 51 (service agetty-service-type
diff --git a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl b/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl
index 1baca024912..7353fb3c442 100644
--- a/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl
+++ b/gnu/system/examples/raspberry-pi-64-nfs-root.tmpl
@@ -58,7 +58,7 @@
58 (packages (cons* openssh 58 (packages (cons* openssh
59 %base-packages)) 59 %base-packages))
60 (services (cons* (service avahi-service-type) 60 (services (cons* (service avahi-service-type)
61 (service dhcp-client-service-type) 61 (service dhcpcd-service-type)
62 (service ntp-service-type) 62 (service ntp-service-type)
63 (service openssh-service-type 63 (service openssh-service-type
64 (openssh-configuration 64 (openssh-configuration
diff --git a/gnu/system/examples/raspberry-pi-64.tmpl b/gnu/system/examples/raspberry-pi-64.tmpl
index 971f778cb28..5764abeb752 100644
--- a/gnu/system/examples/raspberry-pi-64.tmpl
+++ b/gnu/system/examples/raspberry-pi-64.tmpl
@@ -62,7 +62,7 @@
62 (packages (cons* openssh 62 (packages (cons* openssh
63 %base-packages)) 63 %base-packages))
64 (services (cons* (service avahi-service-type) 64 (services (cons* (service avahi-service-type)
65 (service dhcp-client-service-type) 65 (service dhcpcd-service-type)
66 (service ntp-service-type) 66 (service ntp-service-type)
67 (service openssh-service-type 67 (service openssh-service-type
68 (openssh-configuration 68 (openssh-configuration
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl
index 589de493b13..205ae73a9fc 100644
--- a/gnu/system/examples/vm-image.tmpl
+++ b/gnu/system/examples/vm-image.tmpl
@@ -98,7 +98,7 @@ root ALL=(ALL) ALL
98 (service spice-vdagent-service-type) 98 (service spice-vdagent-service-type)
99 99
100 ;; Use the DHCP client service rather than NetworkManager. 100 ;; Use the DHCP client service rather than NetworkManager.
101 (service dhcp-client-service-type)) 101 (service dhcpcd-service-type))
102 102
103 ;; Remove some services that don't make sense in a VM. 103 ;; Remove some services that don't make sense in a VM.
104 (remove (lambda (service) 104 (remove (lambda (service)
diff --git a/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm
index 6ec644f113b..0229f75f1db 100644
--- a/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm
+++ b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm
@@ -53,7 +53,7 @@
53 (baud-rate "1500000") 53 (baud-rate "1500000")
54 (term "vt100") 54 (term "vt100")
55 (tty "ttyS2"))) 55 (tty "ttyS2")))
56 (service dhcp-client-service-type) 56 (service dhcpcd-service-type)
57 (service ntp-service-type) %base-services)))) 57 (service ntp-service-type) %base-services))))
58 58
59(define orangepi-r1-plus-lts-rk3328-image-type 59(define orangepi-r1-plus-lts-rk3328-image-type
diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm
index 457ff4345fc..43c99c231f8 100644
--- a/gnu/system/images/pine64.scm
+++ b/gnu/system/images/pine64.scm
@@ -57,7 +57,7 @@
57 (baud-rate "115200") 57 (baud-rate "115200")
58 (term "vt100") 58 (term "vt100")
59 (tty "ttyS0"))) 59 (tty "ttyS0")))
60 (service dhcp-client-service-type) 60 (service dhcpcd-service-type)
61 (service ntp-service-type) 61 (service ntp-service-type)
62 %base-services)))) 62 %base-services))))
63 63
diff --git a/gnu/system/images/rock64.scm b/gnu/system/images/rock64.scm
index b3dcfc61931..1fb6b7ddbc4 100644
--- a/gnu/system/images/rock64.scm
+++ b/gnu/system/images/rock64.scm
@@ -48,7 +48,7 @@
48 (mount-point "/") 48 (mount-point "/")
49 (type "ext4")) 49 (type "ext4"))
50 %base-file-systems)) 50 %base-file-systems))
51 (services (append (list (service dhcp-client-service-type)) 51 (services (append (list (service dhcpcd-service-type))
52 %base-services)))) 52 %base-services))))
53 53
54(define rock64-image-type 54(define rock64-image-type
diff --git a/gnu/system/images/unmatched.scm b/gnu/system/images/unmatched.scm
index d40a32f1840..b4e2d7b18bb 100644
--- a/gnu/system/images/unmatched.scm
+++ b/gnu/system/images/unmatched.scm
@@ -55,7 +55,7 @@
55 (baud-rate "115200") 55 (baud-rate "115200")
56 (term "vt100") 56 (term "vt100")
57 (tty "ttySIF0"))) 57 (tty "ttySIF0")))
58 (service dhcp-client-service-type)) 58 (service dhcpcd-service-type))
59 %base-services)))) 59 %base-services))))
60 60
61(define unmatched-disk-image 61(define unmatched-disk-image
diff --git a/gnu/system/images/visionfive2.scm b/gnu/system/images/visionfive2.scm
index 977d10798a0..6cbf18ed6af 100644
--- a/gnu/system/images/visionfive2.scm
+++ b/gnu/system/images/visionfive2.scm
@@ -93,7 +93,7 @@
93 (baud-rate "115200") 93 (baud-rate "115200")
94 (term "vt100") 94 (term "vt100")
95 (tty "ttyS0"))) 95 (tty "ttyS0")))
96 (service dhcp-client-service-type)) 96 (service dhcpcd-service-type))
97 %base-services)))) 97 %base-services))))
98 98
99(define visionfive2-disk-image 99(define visionfive2-disk-image
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index 23298638b7a..d16d1e78b56 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -134,7 +134,7 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS."
134 ;; Replace these with dummy-networking-service-type below. 134 ;; Replace these with dummy-networking-service-type below.
135 (list 135 (list
136 static-networking-service-type 136 static-networking-service-type
137 dhcp-client-service-type 137 dhcpcd-service-type
138 network-manager-service-type 138 network-manager-service-type
139 connman-service-type) 139 connman-service-type)
140 (list static-networking-service-type)))) ;loopback 140 (list static-networking-service-type)))) ;loopback