summaryrefslogtreecommitdiff
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
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
-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 019111c167..69790b8951 100644
--- a/gnu/system/examples/asus-c201.tmpl
+++ b/gnu/system/examples/asus-c201.tmpl
@@ -54,7 +54,7 @@
;; Add services to the baseline: a DHCP client and
;; an SSH server.
- (services (append (list (service dhcp-client-service-type)
+ (services (append (list (service dhcpcd-service-type)
(service openssh-service-type
(openssh-configuration
(port-number 2222))))
diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl
index 7b6a4b09b0..6493855a08 100644
--- a/gnu/system/examples/bare-bones.tmpl
+++ b/gnu/system/examples/bare-bones.tmpl
@@ -47,7 +47,7 @@
;; Add services to the baseline: a DHCP client and an SSH
;; server. You may wish to add an NTP service here.
- (services (append (list (service dhcp-client-service-type)
+ (services (append (list (service dhcpcd-service-type)
(service openssh-service-type
(openssh-configuration
(openssh openssh-sans-x)
diff --git a/gnu/system/examples/beaglebone-black.tmpl b/gnu/system/examples/beaglebone-black.tmpl
index 18bbb2723c..007c270713 100644
--- a/gnu/system/examples/beaglebone-black.tmpl
+++ b/gnu/system/examples/beaglebone-black.tmpl
@@ -45,7 +45,7 @@
;; Globally-installed packages.
(packages (append (list screen openssh) %base-packages))
- (services (append (list (service dhcp-client-service-type)
+ (services (append (list (service dhcpcd-service-type)
;; mingetty does not work on serial lines.
;; Use agetty with board-specific serial parameters.
(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 1baca02491..7353fb3c44 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 @@
(packages (cons* openssh
%base-packages))
(services (cons* (service avahi-service-type)
- (service dhcp-client-service-type)
+ (service dhcpcd-service-type)
(service ntp-service-type)
(service openssh-service-type
(openssh-configuration
diff --git a/gnu/system/examples/raspberry-pi-64.tmpl b/gnu/system/examples/raspberry-pi-64.tmpl
index 971f778cb2..5764abeb75 100644
--- a/gnu/system/examples/raspberry-pi-64.tmpl
+++ b/gnu/system/examples/raspberry-pi-64.tmpl
@@ -62,7 +62,7 @@
(packages (cons* openssh
%base-packages))
(services (cons* (service avahi-service-type)
- (service dhcp-client-service-type)
+ (service dhcpcd-service-type)
(service ntp-service-type)
(service openssh-service-type
(openssh-configuration
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl
index 589de493b1..205ae73a9f 100644
--- a/gnu/system/examples/vm-image.tmpl
+++ b/gnu/system/examples/vm-image.tmpl
@@ -98,7 +98,7 @@ root ALL=(ALL) ALL
(service spice-vdagent-service-type)
;; Use the DHCP client service rather than NetworkManager.
- (service dhcp-client-service-type))
+ (service dhcpcd-service-type))
;; Remove some services that don't make sense in a VM.
(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 6ec644f113..0229f75f1d 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 @@
(baud-rate "1500000")
(term "vt100")
(tty "ttyS2")))
- (service dhcp-client-service-type)
+ (service dhcpcd-service-type)
(service ntp-service-type) %base-services))))
(define orangepi-r1-plus-lts-rk3328-image-type
diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm
index 457ff4345f..43c99c231f 100644
--- a/gnu/system/images/pine64.scm
+++ b/gnu/system/images/pine64.scm
@@ -57,7 +57,7 @@
(baud-rate "115200")
(term "vt100")
(tty "ttyS0")))
- (service dhcp-client-service-type)
+ (service dhcpcd-service-type)
(service ntp-service-type)
%base-services))))
diff --git a/gnu/system/images/rock64.scm b/gnu/system/images/rock64.scm
index b3dcfc6193..1fb6b7ddbc 100644
--- a/gnu/system/images/rock64.scm
+++ b/gnu/system/images/rock64.scm
@@ -48,7 +48,7 @@
(mount-point "/")
(type "ext4"))
%base-file-systems))
- (services (append (list (service dhcp-client-service-type))
+ (services (append (list (service dhcpcd-service-type))
%base-services))))
(define rock64-image-type
diff --git a/gnu/system/images/unmatched.scm b/gnu/system/images/unmatched.scm
index d40a32f184..b4e2d7b18b 100644
--- a/gnu/system/images/unmatched.scm
+++ b/gnu/system/images/unmatched.scm
@@ -55,7 +55,7 @@
(baud-rate "115200")
(term "vt100")
(tty "ttySIF0")))
- (service dhcp-client-service-type))
+ (service dhcpcd-service-type))
%base-services))))
(define unmatched-disk-image
diff --git a/gnu/system/images/visionfive2.scm b/gnu/system/images/visionfive2.scm
index 977d10798a..6cbf18ed6a 100644
--- a/gnu/system/images/visionfive2.scm
+++ b/gnu/system/images/visionfive2.scm
@@ -93,7 +93,7 @@
(baud-rate "115200")
(term "vt100")
(tty "ttyS0")))
- (service dhcp-client-service-type))
+ (service dhcpcd-service-type))
%base-services))))
(define visionfive2-disk-image
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index 23298638b7..d16d1e78b5 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."
;; Replace these with dummy-networking-service-type below.
(list
static-networking-service-type
- dhcp-client-service-type
+ dhcpcd-service-type
network-manager-service-type
connman-service-type)
(list static-networking-service-type)))) ;loopback