summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorGabriel Wicki <gabriel@erlikon.ch>2025-07-21 19:54:42 +0200
committerGabriel Wicki <gabriel@erlikon.ch>2025-07-24 18:46:34 +0200
commit39405f7981455798c45cc1beb26c579efb018b8f (patch)
tree7ab89279c0597f5a771aaeaeb18ae3c803e58bec /gnu
parentaea73f5b742c8c36b97c2947f1e7e4ee3a2a3039 (diff)
gnu: tests: Replace deprecated dhcp client service.
* gnu/tests/audio.scm, gnu/tests/avahi.scm, gnu/tests/ci.scm, gnu/tests/containers.scm, gnu/tests/cups.scm, gnu/tests/databases.scm, gnu/tests/dict.scm, gnu/tests/dns.scm, gnu/tests/docker.scm, gnu/tests/file-sharing.scm, gnu/tests/guix.scm, gnu/tests/install.scm, gnu/tests/ldap.scm, gnu/tests/lightdm.scm, gnu/tests/mail.scm, gnu/tests/messaging.scm, gnu/tests/monitoring.scm, gnu/tests/networking.scm, gnu/tests/nfs.scm, gnu/tests/package-management.scm, gnu/tests/rsync.scm, gnu/tests/samba.scm, gnu/tests/ssh.scm, gnu/tests/telephony.scm, gnu/tests/upnp.scm, gnu/tests/version-control.scm, gnu/tests/virtualization.scm, gnu/tests/vnstat.scm, gnu/tests/web.scm: (services): Replace dhcp-client-service-type with its replacement dhcpcd-service-type. Change-Id: I01d7f9a8c01736d8c8da591aaf4749bbfa4dcdad
Diffstat (limited to 'gnu')
-rw-r--r--gnu/tests/audio.scm2
-rw-r--r--gnu/tests/avahi.scm2
-rw-r--r--gnu/tests/ci.scm2
-rw-r--r--gnu/tests/containers.scm2
-rw-r--r--gnu/tests/cups.scm2
-rw-r--r--gnu/tests/databases.scm2
-rw-r--r--gnu/tests/dict.scm2
-rw-r--r--gnu/tests/dns.scm2
-rw-r--r--gnu/tests/docker.scm4
-rw-r--r--gnu/tests/file-sharing.scm2
-rw-r--r--gnu/tests/guix.scm8
-rw-r--r--gnu/tests/install.scm2
-rw-r--r--gnu/tests/ldap.scm2
-rw-r--r--gnu/tests/lightdm.scm2
-rw-r--r--gnu/tests/mail.scm8
-rw-r--r--gnu/tests/messaging.scm10
-rw-r--r--gnu/tests/monitoring.scm4
-rw-r--r--gnu/tests/networking.scm8
-rw-r--r--gnu/tests/nfs.scm4
-rw-r--r--gnu/tests/package-management.scm2
-rw-r--r--gnu/tests/rsync.scm2
-rw-r--r--gnu/tests/samba.scm4
-rw-r--r--gnu/tests/ssh.scm2
-rw-r--r--gnu/tests/telephony.scm2
-rw-r--r--gnu/tests/upnp.scm2
-rw-r--r--gnu/tests/version-control.scm8
-rw-r--r--gnu/tests/virtualization.scm4
-rw-r--r--gnu/tests/vnstat.scm2
-rw-r--r--gnu/tests/web.scm18
29 files changed, 58 insertions, 58 deletions
diff --git a/gnu/tests/audio.scm b/gnu/tests/audio.scm
index acb91293e83..fc29acf5e60 100644
--- a/gnu/tests/audio.scm
+++ b/gnu/tests/audio.scm
@@ -82,7 +82,7 @@
82 82
83(define (run-mympd-test) 83(define (run-mympd-test)
84 (define os (marionette-operating-system 84 (define os (marionette-operating-system
85 (simple-operating-system (service dhcp-client-service-type) 85 (simple-operating-system (service dhcpcd-service-type)
86 (service mympd-service-type)) 86 (service mympd-service-type))
87 #:imported-modules '((gnu services herd)))) 87 #:imported-modules '((gnu services herd))))
88 88
diff --git a/gnu/tests/avahi.scm b/gnu/tests/avahi.scm
index fd6941a2925..32310321247 100644
--- a/gnu/tests/avahi.scm
+++ b/gnu/tests/avahi.scm
@@ -43,7 +43,7 @@
43 (services (cons* (service avahi-service-type 43 (services (cons* (service avahi-service-type
44 (avahi-configuration (debug? #t))) 44 (avahi-configuration (debug? #t)))
45 (service dbus-root-service-type) 45 (service dbus-root-service-type)
46 (service dhcp-client-service-type) ;needed for multicast 46 (service dhcpcd-service-type) ;needed for multicast
47 47
48 ;; Enable heavyweight debugging output. 48 ;; Enable heavyweight debugging output.
49 (modify-services (operating-system-user-services 49 (modify-services (operating-system-user-services
diff --git a/gnu/tests/ci.scm b/gnu/tests/ci.scm
index 5294514c667..a9310c6201d 100644
--- a/gnu/tests/ci.scm
+++ b/gnu/tests/ci.scm
@@ -38,7 +38,7 @@
38(define %laminar-os 38(define %laminar-os
39 ;; Operating system under test. 39 ;; Operating system under test.
40 (simple-operating-system 40 (simple-operating-system
41 (service dhcp-client-service-type) 41 (service dhcpcd-service-type)
42 (service laminar-service-type))) 42 (service laminar-service-type)))
43 43
44(define* (run-laminar-test #:optional (http-port 8080)) 44(define* (run-laminar-test #:optional (http-port 8080))
diff --git a/gnu/tests/containers.scm b/gnu/tests/containers.scm
index 0ecc8ddb126..618da2a92ce 100644
--- a/gnu/tests/containers.scm
+++ b/gnu/tests/containers.scm
@@ -51,7 +51,7 @@
51 (subuids 51 (subuids
52 (list (subid-range (name "dummy")))))) 52 (list (subid-range (name "dummy"))))))
53 53
54 (service dhcp-client-service-type) 54 (service dhcpcd-service-type)
55 (service dbus-root-service-type) 55 (service dbus-root-service-type)
56 (service polkit-service-type) 56 (service polkit-service-type)
57 (service elogind-service-type) 57 (service elogind-service-type)
diff --git a/gnu/tests/cups.scm b/gnu/tests/cups.scm
index 4c7d78b7c85..81e344299ec 100644
--- a/gnu/tests/cups.scm
+++ b/gnu/tests/cups.scm
@@ -84,7 +84,7 @@
84 84
85(define %cups-os 85(define %cups-os
86 (simple-operating-system 86 (simple-operating-system
87 (service dhcp-client-service-type) 87 (service dhcpcd-service-type)
88 (service cups-service-type 88 (service cups-service-type
89 (cups-configuration 89 (cups-configuration
90 (web-interface? #t) 90 (web-interface? #t)
diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm
index 0b2a8acfbba..4d4ed1004dd 100644
--- a/gnu/tests/databases.scm
+++ b/gnu/tests/databases.scm
@@ -42,7 +42,7 @@
42 42
43(define %memcached-os 43(define %memcached-os
44 (simple-operating-system 44 (simple-operating-system
45 (service dhcp-client-service-type) 45 (service dhcpcd-service-type)
46 (service memcached-service-type))) 46 (service memcached-service-type)))
47 47
48(define* (run-memcached-test #:optional (port 11211)) 48(define* (run-memcached-test #:optional (port 11211))
diff --git a/gnu/tests/dict.scm b/gnu/tests/dict.scm
index f02bd5ac990..1596d54b283 100644
--- a/gnu/tests/dict.scm
+++ b/gnu/tests/dict.scm
@@ -34,7 +34,7 @@
34 34
35(define %dicod-os 35(define %dicod-os
36 (simple-operating-system 36 (simple-operating-system
37 (service dhcp-client-service-type) 37 (service dhcpcd-service-type)
38 (service dicod-service-type 38 (service dicod-service-type
39 (dicod-configuration 39 (dicod-configuration
40 (interfaces '("0.0.0.0")) 40 (interfaces '("0.0.0.0"))
diff --git a/gnu/tests/dns.scm b/gnu/tests/dns.scm
index ff42456760c..c737b5bf643 100644
--- a/gnu/tests/dns.scm
+++ b/gnu/tests/dns.scm
@@ -31,7 +31,7 @@
31 ;; TODO: Unbound config 31 ;; TODO: Unbound config
32 (let ((base-os 32 (let ((base-os
33 (simple-operating-system 33 (simple-operating-system
34 (service dhcp-client-service-type) 34 (service dhcpcd-service-type)
35 (service unbound-service-type 35 (service unbound-service-type
36 (unbound-configuration 36 (unbound-configuration
37 (server 37 (server
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm
index 90c8d0f8508..8952daab2f5 100644
--- a/gnu/tests/docker.scm
+++ b/gnu/tests/docker.scm
@@ -50,7 +50,7 @@
50 50
51(define %docker-os 51(define %docker-os
52 (simple-operating-system 52 (simple-operating-system
53 (service dhcp-client-service-type) 53 (service dhcpcd-service-type)
54 (service dbus-root-service-type) 54 (service dbus-root-service-type)
55 (service polkit-service-type) 55 (service polkit-service-type)
56 (service elogind-service-type) 56 (service elogind-service-type)
@@ -352,7 +352,7 @@ docker-image} inside Docker.")
352 352
353(define %oci-os 353(define %oci-os
354 (simple-operating-system 354 (simple-operating-system
355 (service dhcp-client-service-type) 355 (service dhcpcd-service-type)
356 (service dbus-root-service-type) 356 (service dbus-root-service-type)
357 (service polkit-service-type) 357 (service polkit-service-type)
358 (service elogind-service-type) 358 (service elogind-service-type)
diff --git a/gnu/tests/file-sharing.scm b/gnu/tests/file-sharing.scm
index d1343e2ebaa..fd8431e9883 100644
--- a/gnu/tests/file-sharing.scm
+++ b/gnu/tests/file-sharing.scm
@@ -71,7 +71,7 @@
71 (define os 71 (define os
72 (marionette-operating-system 72 (marionette-operating-system
73 (simple-operating-system 73 (simple-operating-system
74 (service dhcp-client-service-type) 74 (service dhcpcd-service-type)
75 (service transmission-daemon-service-type 75 (service transmission-daemon-service-type
76 %transmission-daemon-test-configuration)) 76 %transmission-daemon-test-configuration))
77 #:imported-modules '((gnu services herd) 77 #:imported-modules '((gnu services herd)
diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm
index fbc779828c4..14982cf1b5c 100644
--- a/gnu/tests/guix.scm
+++ b/gnu/tests/guix.scm
@@ -49,7 +49,7 @@
49 49
50(define %guix-build-coordinator-os 50(define %guix-build-coordinator-os
51 (simple-operating-system 51 (simple-operating-system
52 (service dhcp-client-service-type) 52 (service dhcpcd-service-type)
53 (service guix-build-coordinator-service-type))) 53 (service guix-build-coordinator-service-type)))
54 54
55(define (run-guix-build-coordinator-test) 55(define (run-guix-build-coordinator-test)
@@ -155,7 +155,7 @@
155 155
156(define %guix-data-service-os 156(define %guix-data-service-os
157 (simple-operating-system 157 (simple-operating-system
158 (service dhcp-client-service-type) 158 (service dhcpcd-service-type)
159 (service postgresql-service-type 159 (service postgresql-service-type
160 (postgresql-configuration 160 (postgresql-configuration
161 (postgresql postgresql) 161 (postgresql postgresql)
@@ -331,7 +331,7 @@ host all all ::1/128 trust"))))))
331 331
332(define %nar-herder-os 332(define %nar-herder-os
333 (simple-operating-system 333 (simple-operating-system
334 (service dhcp-client-service-type) 334 (service dhcpcd-service-type)
335 (service nar-herder-service-type 335 (service nar-herder-service-type
336 (nar-herder-configuration 336 (nar-herder-configuration
337 (host "0.0.0.0") 337 (host "0.0.0.0")
@@ -407,7 +407,7 @@ host all all ::1/128 trust"))))))
407 407
408(define %bffe-os 408(define %bffe-os
409 (simple-operating-system 409 (simple-operating-system
410 (service dhcp-client-service-type) 410 (service dhcpcd-service-type)
411 (service guix-build-coordinator-service-type) 411 (service guix-build-coordinator-service-type)
412 (service bffe-service-type 412 (service bffe-service-type
413 (bffe-configuration 413 (bffe-configuration
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 97c3505fb09..ec31cf2bdf5 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -1978,7 +1978,7 @@ build (current-guix) and then store a couple of full system images.")
1978 (list 1978 (list
1979 (swap-space 1979 (swap-space
1980 (target (uuid "11111111-2222-3333-4444-123456789abc")))))) 1980 (target (uuid "11111111-2222-3333-4444-123456789abc"))))))
1981 (services (cons* (service dhcp-client-service-type) 1981 (services (cons* (service dhcpcd-service-type)
1982 (service ntp-service-type) 1982 (service ntp-service-type)
1983 (operating-system-user-services %minimal-os-on-vda))))) 1983 (operating-system-user-services %minimal-os-on-vda)))))
1984 1984
diff --git a/gnu/tests/ldap.scm b/gnu/tests/ldap.scm
index 2cf7491f3e5..4c79079d28a 100644
--- a/gnu/tests/ldap.scm
+++ b/gnu/tests/ldap.scm
@@ -33,7 +33,7 @@
33(define %ldap-os 33(define %ldap-os
34 (let ((simple 34 (let ((simple
35 (simple-operating-system 35 (simple-operating-system
36 (service dhcp-client-service-type) 36 (service dhcpcd-service-type)
37 (service nslcd-service-type)))) 37 (service nslcd-service-type))))
38 (operating-system 38 (operating-system
39 (inherit simple) 39 (inherit simple)
diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm
index 0fd809a9844..fd5c77677e1 100644
--- a/gnu/tests/lightdm.scm
+++ b/gnu/tests/lightdm.scm
@@ -77,7 +77,7 @@
77 (user-session "ratpoison")))))) 77 (user-session "ratpoison"))))))
78 78
79 ;; For debugging. 79 ;; For debugging.
80 (service dhcp-client-service-type) 80 (service dhcpcd-service-type)
81 (service openssh-service-type 81 (service openssh-service-type
82 (openssh-configuration 82 (openssh-configuration
83 (permit-root-login #t) 83 (permit-root-login #t)
diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm
index 4ebee3ef997..07a4487d785 100644
--- a/gnu/tests/mail.scm
+++ b/gnu/tests/mail.scm
@@ -46,7 +46,7 @@
46 46
47(define %opensmtpd-os 47(define %opensmtpd-os
48 (simple-operating-system 48 (simple-operating-system
49 (service dhcp-client-service-type) 49 (service dhcpcd-service-type)
50 (service opensmtpd-service-type 50 (service opensmtpd-service-type
51 (opensmtpd-configuration 51 (opensmtpd-configuration
52 (config-file 52 (config-file
@@ -170,7 +170,7 @@ match from any for local action inbound
170 170
171(define %exim-os 171(define %exim-os
172 (simple-operating-system 172 (simple-operating-system
173 (service dhcp-client-service-type) 173 (service dhcpcd-service-type)
174 (service mail-aliases-service-type '()) 174 (service mail-aliases-service-type '())
175 (service exim-service-type 175 (service exim-service-type
176 (exim-configuration 176 (exim-configuration
@@ -294,7 +294,7 @@ acl_check_data:
294 294
295(define %dovecot-os 295(define %dovecot-os
296 (simple-operating-system 296 (simple-operating-system
297 (service dhcp-client-service-type) 297 (service dhcpcd-service-type)
298 (service dovecot-service-type 298 (service dovecot-service-type
299 (dovecot-configuration 299 (dovecot-configuration
300 (extensions (list dovecot-pigeonhole)) 300 (extensions (list dovecot-pigeonhole))
@@ -474,7 +474,7 @@ addheader \"X-Sieve-Filtered\" \"Guix\";
474 (supplementary-groups '("wheel" "audio" "video"))) 474 (supplementary-groups '("wheel" "audio" "video")))
475 %base-user-accounts)) 475 %base-user-accounts))
476 476
477 (services (cons* (service dhcp-client-service-type) 477 (services (cons* (service dhcpcd-service-type)
478 (service dovecot-service-type 478 (service dovecot-service-type
479 (dovecot-configuration 479 (dovecot-configuration
480 (disable-plaintext-auth? #f) 480 (disable-plaintext-auth? #f)
diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm
index 8df67433a7f..f1f4247c582 100644
--- a/gnu/tests/messaging.scm
+++ b/gnu/tests/messaging.scm
@@ -48,7 +48,7 @@
48 "Run a test of an OS running XMPP-SERVICE, which writes its PID to PID-FILE." 48 "Run a test of an OS running XMPP-SERVICE, which writes its PID to PID-FILE."
49 (define os 49 (define os
50 (marionette-operating-system 50 (marionette-operating-system
51 (simple-operating-system (service dhcp-client-service-type) 51 (simple-operating-system (service dhcpcd-service-type)
52 xmpp-service) 52 xmpp-service)
53 #:imported-modules '((gnu services herd)))) 53 #:imported-modules '((gnu services herd))))
54 54
@@ -177,7 +177,7 @@
177(define (run-bitlbee-test) 177(define (run-bitlbee-test)
178 (define os 178 (define os
179 (marionette-operating-system 179 (marionette-operating-system
180 (simple-operating-system (service dhcp-client-service-type) 180 (simple-operating-system (service dhcpcd-service-type)
181 (service bitlbee-service-type 181 (service bitlbee-service-type
182 (bitlbee-configuration 182 (bitlbee-configuration
183 (interface "0.0.0.0")))) 183 (interface "0.0.0.0"))))
@@ -239,7 +239,7 @@
239 (packages (cons* ii screen %base-packages)) 239 (packages (cons* ii screen %base-packages))
240 (services 240 (services
241 (cons* 241 (cons*
242 (service dhcp-client-service-type) 242 (service dhcpcd-service-type)
243 (service ngircd-service-type 243 (service ngircd-service-type
244 (ngircd-configuration 244 (ngircd-configuration
245 (debug? #t) 245 (debug? #t)
@@ -403,7 +403,7 @@
403 %base-packages)) 403 %base-packages))
404 (services 404 (services
405 (cons* 405 (cons*
406 (service dhcp-client-service-type) 406 (service dhcpcd-service-type)
407 (service ngircd-tls-cert-service-type) 407 (service ngircd-tls-cert-service-type)
408 (service ngircd-service-type 408 (service ngircd-service-type
409 (ngircd-configuration 409 (ngircd-configuration
@@ -549,7 +549,7 @@ OPENSSL:localhost:7000,verify=0 &")
549(define (run-quassel-test) 549(define (run-quassel-test)
550 (define os 550 (define os
551 (marionette-operating-system 551 (marionette-operating-system
552 (simple-operating-system (service dhcp-client-service-type) 552 (simple-operating-system (service dhcpcd-service-type)
553 (service quassel-service-type)) 553 (service quassel-service-type))
554 #:imported-modules (source-module-closure 554 #:imported-modules (source-module-closure
555 '((gnu services herd))))) 555 '((gnu services herd)))))
diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm
index a9545410ecd..6db2b2c0087 100644
--- a/gnu/tests/monitoring.scm
+++ b/gnu/tests/monitoring.scm
@@ -91,7 +91,7 @@
91 91
92(define %prometheus-node-exporter-os 92(define %prometheus-node-exporter-os
93 (simple-operating-system 93 (simple-operating-system
94 (service dhcp-client-service-type) 94 (service dhcpcd-service-type)
95 (service prometheus-node-exporter-service-type 95 (service prometheus-node-exporter-service-type
96 (prometheus-node-exporter-configuration)))) 96 (prometheus-node-exporter-configuration))))
97 97
@@ -303,7 +303,7 @@ zabbix||{}
303 ;; Return operating system under test. 303 ;; Return operating system under test.
304 (let ((base-os 304 (let ((base-os
305 (simple-operating-system 305 (simple-operating-system
306 (service dhcp-client-service-type) 306 (service dhcpcd-service-type)
307 (service postgresql-service-type 307 (service postgresql-service-type
308 (postgresql-configuration 308 (postgresql-configuration
309 (postgresql postgresql))) 309 (postgresql postgresql)))
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index 2865e6ff350..b640d8c67a2 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -359,7 +359,7 @@ passed an invalid device.")
359(define %inetd-os 359(define %inetd-os
360 ;; Operating system with 2 inetd services. 360 ;; Operating system with 2 inetd services.
361 (simple-operating-system 361 (simple-operating-system
362 (service dhcp-client-service-type) 362 (service dhcpcd-service-type)
363 (service inetd-service-type 363 (service inetd-service-type
364 (inetd-configuration 364 (inetd-configuration
365 (entries (list 365 (entries (list
@@ -692,7 +692,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
692 692
693(define %dnsmasq-os 693(define %dnsmasq-os
694 (simple-operating-system 694 (simple-operating-system
695 (service dhcp-client-service-type) 695 (service dhcpcd-service-type)
696 (service dnsmasq-service-type 696 (service dnsmasq-service-type
697 (dnsmasq-configuration 697 (dnsmasq-configuration
698 (extra-options 698 (extra-options
@@ -996,7 +996,7 @@ COMMIT
996 (define os 996 (define os
997 (marionette-operating-system 997 (marionette-operating-system
998 (simple-operating-system 998 (simple-operating-system
999 (service dhcp-client-service-type) 999 (service dhcpcd-service-type)
1000 (service inetd-service-type 1000 (service inetd-service-type
1001 (inetd-configuration 1001 (inetd-configuration
1002 (entries (list 1002 (entries (list
@@ -1100,7 +1100,7 @@ COMMIT
1100 1100
1101(define (make-nftables-os ruleset) 1101(define (make-nftables-os ruleset)
1102 (simple-operating-system 1102 (simple-operating-system
1103 (service dhcp-client-service-type) 1103 (service dhcpcd-service-type)
1104 (service inetd-service-type 1104 (service inetd-service-type
1105 (inetd-configuration 1105 (inetd-configuration
1106 (entries (list 1106 (entries (list
diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm
index c08f7186a28..0453d453820 100644
--- a/gnu/tests/nfs.scm
+++ b/gnu/tests/nfs.scm
@@ -60,7 +60,7 @@
60 %base-packages)) 60 %base-packages))
61 (services (cons* 61 (services (cons*
62 (service rpcbind-service-type) 62 (service rpcbind-service-type)
63 (service dhcp-client-service-type) 63 (service dhcpcd-service-type)
64 %base-services)))) 64 %base-services))))
65 65
66(define (run-nfs-test name socket) 66(define (run-nfs-test name socket)
@@ -148,7 +148,7 @@
148 (mkdir "/remote") 148 (mkdir "/remote")
149 (chmod "/remote" #o777) 149 (chmod "/remote" #o777)
150 #t)) 150 #t))
151 (service dhcp-client-service-type) 151 (service dhcpcd-service-type)
152 (service nfs-service-type 152 (service nfs-service-type
153 (nfs-configuration 153 (nfs-configuration
154 (debug '(nfs nfsd mountd)) 154 (debug '(nfs nfsd mountd))
diff --git a/gnu/tests/package-management.scm b/gnu/tests/package-management.scm
index 6d61dea4f80..c5102fff74d 100644
--- a/gnu/tests/package-management.scm
+++ b/gnu/tests/package-management.scm
@@ -99,7 +99,7 @@
99 (let ((base-os 99 (let ((base-os
100 (simple-operating-system 100 (simple-operating-system
101 (service nix-service-type) 101 (service nix-service-type)
102 (service dhcp-client-service-type)))) 102 (service dhcpcd-service-type))))
103 (operating-system 103 (operating-system
104 (inherit base-os) 104 (inherit base-os)
105 (packages (cons nix (operating-system-packages base-os)))))) 105 (packages (cons nix (operating-system-packages base-os))))))
diff --git a/gnu/tests/rsync.scm b/gnu/tests/rsync.scm
index 182e5f76ffd..8194713ad3f 100644
--- a/gnu/tests/rsync.scm
+++ b/gnu/tests/rsync.scm
@@ -136,7 +136,7 @@ PORT."
136 ;; Return operating system under test. 136 ;; Return operating system under test.
137 (let ((base-os 137 (let ((base-os
138 (simple-operating-system 138 (simple-operating-system
139 (service dhcp-client-service-type) 139 (service dhcpcd-service-type)
140 (service rsync-service-type 140 (service rsync-service-type
141 (rsync-configuration 141 (rsync-configuration
142 (modules (list (rsync-module 142 (modules (list (rsync-module
diff --git a/gnu/tests/samba.scm b/gnu/tests/samba.scm
index cb2762a90e4..db9f27c9ce2 100644
--- a/gnu/tests/samba.scm
+++ b/gnu/tests/samba.scm
@@ -42,7 +42,7 @@
42 (chown "/srv/samba/guest" 42 (chown "/srv/samba/guest"
43 (passwd:uid (getpw "nobody")) 43 (passwd:uid (getpw "nobody"))
44 (passwd:gid (getpw "nobody"))))) 44 (passwd:gid (getpw "nobody")))))
45 (service dhcp-client-service-type) 45 (service dhcpcd-service-type)
46 (service samba-service-type 46 (service samba-service-type
47 (samba-configuration 47 (samba-configuration
48 (config-file (plain-file "smb.conf" " 48 (config-file (plain-file "smb.conf" "
@@ -165,7 +165,7 @@
165 165
166(define %wsdd-os 166(define %wsdd-os
167 (let ((base-os (simple-operating-system 167 (let ((base-os (simple-operating-system
168 (service dhcp-client-service-type) 168 (service dhcpcd-service-type)
169 (service wsdd-service-type)))) 169 (service wsdd-service-type))))
170 (operating-system 170 (operating-system
171 (inherit base-os) 171 (inherit base-os)
diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm
index 4882c7a88b1..21f098ad669 100644
--- a/gnu/tests/ssh.scm
+++ b/gnu/tests/ssh.scm
@@ -40,7 +40,7 @@ empty-password logins.
40When SFTP? is true, run an SFTP server test." 40When SFTP? is true, run an SFTP server test."
41 (define os 41 (define os
42 (marionette-operating-system 42 (marionette-operating-system
43 (simple-operating-system (service dhcp-client-service-type) ssh-service) 43 (simple-operating-system (service dhcpcd-service-type) ssh-service)
44 #:imported-modules '((gnu services herd) 44 #:imported-modules '((gnu services herd)
45 (guix combinators)))) 45 (guix combinators))))
46 (define vm 46 (define vm
diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm
index f03ea963f7e..ef5474bef0b 100644
--- a/gnu/tests/telephony.scm
+++ b/gnu/tests/telephony.scm
@@ -111,7 +111,7 @@
111 (service dbus-root-service-type) 111 (service dbus-root-service-type)
112 ;; The following services/packages are added for 112 ;; The following services/packages are added for
113 ;; debugging purposes. 113 ;; debugging purposes.
114 (service dhcp-client-service-type) 114 (service dhcpcd-service-type)
115 (service openssh-service-type 115 (service openssh-service-type
116 (openssh-configuration 116 (openssh-configuration
117 (permit-root-login #t) 117 (permit-root-login #t)
diff --git a/gnu/tests/upnp.scm b/gnu/tests/upnp.scm
index 0224557f401..079df6c7771 100644
--- a/gnu/tests/upnp.scm
+++ b/gnu/tests/upnp.scm
@@ -47,7 +47,7 @@
47 (define os 47 (define os
48 (marionette-operating-system 48 (marionette-operating-system
49 (simple-operating-system 49 (simple-operating-system
50 (service dhcp-client-service-type) 50 (service dhcpcd-service-type)
51 (service readymedia-service-type 51 (service readymedia-service-type
52 %readymedia-configuration-test)) 52 %readymedia-configuration-test))
53 #:imported-modules '((gnu services herd) 53 #:imported-modules '((gnu services herd)
diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm
index 18c68a58f28..08863ebc3e9 100644
--- a/gnu/tests/version-control.scm
+++ b/gnu/tests/version-control.scm
@@ -96,7 +96,7 @@
96 ;; Operating system under test. 96 ;; Operating system under test.
97 (let ((base-os 97 (let ((base-os
98 (simple-operating-system 98 (simple-operating-system
99 (service dhcp-client-service-type) 99 (service dhcpcd-service-type)
100 (service cgit-service-type 100 (service cgit-service-type
101 (cgit-configuration 101 (cgit-configuration
102 (nginx %cgit-configuration-nginx))) 102 (nginx %cgit-configuration-nginx)))
@@ -230,7 +230,7 @@ HTTP-PORT."
230 230
231(define %git-http-os 231(define %git-http-os
232 (simple-operating-system 232 (simple-operating-system
233 (service dhcp-client-service-type) 233 (service dhcpcd-service-type)
234 (service fcgiwrap-service-type) 234 (service fcgiwrap-service-type)
235 (service nginx-service-type %git-nginx-configuration) 235 (service nginx-service-type %git-nginx-configuration)
236 %test-repository-service)) 236 %test-repository-service))
@@ -318,7 +318,7 @@ HTTP-PORT."
318 318
319(define %gitolite-os 319(define %gitolite-os
320 (simple-operating-system 320 (simple-operating-system
321 (service dhcp-client-service-type) 321 (service dhcpcd-service-type)
322 (service openssh-service-type) 322 (service openssh-service-type)
323 (service gitolite-service-type 323 (service gitolite-service-type
324 (gitolite-configuration 324 (gitolite-configuration
@@ -415,7 +415,7 @@ HTTP-PORT."
415(define %gitile-os 415(define %gitile-os
416 ;; Operating system under test. 416 ;; Operating system under test.
417 (simple-operating-system 417 (simple-operating-system
418 (service dhcp-client-service-type) 418 (service dhcpcd-service-type)
419 (simple-service 'srv-git activation-service-type 419 (simple-service 'srv-git activation-service-type
420 #~(mkdir-p "/srv/git")) 420 #~(mkdir-p "/srv/git"))
421 (service gitile-service-type 421 (service gitile-service-type
diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm
index e08f66eb281..c55a944845f 100644
--- a/gnu/tests/virtualization.scm
+++ b/gnu/tests/virtualization.scm
@@ -54,7 +54,7 @@
54 54
55(define %libvirt-os 55(define %libvirt-os
56 (simple-operating-system 56 (simple-operating-system
57 (service dhcp-client-service-type) 57 (service dhcpcd-service-type)
58 (service dbus-root-service-type) 58 (service dbus-root-service-type)
59 (service polkit-service-type) 59 (service polkit-service-type)
60 (service libvirt-service-type))) 60 (service libvirt-service-type)))
@@ -266,7 +266,7 @@
266 266
267(define %childhurd-os 267(define %childhurd-os
268 (simple-operating-system 268 (simple-operating-system
269 (service dhcp-client-service-type) 269 (service dhcpcd-service-type)
270 (service hurd-vm-service-type 270 (service hurd-vm-service-type
271 (hurd-vm-configuration 271 (hurd-vm-configuration
272 (os (operating-system 272 (os (operating-system
diff --git a/gnu/tests/vnstat.scm b/gnu/tests/vnstat.scm
index c498b987ffd..7228d3d22b3 100644
--- a/gnu/tests/vnstat.scm
+++ b/gnu/tests/vnstat.scm
@@ -49,7 +49,7 @@
49 (define os 49 (define os
50 (marionette-operating-system 50 (marionette-operating-system
51 (simple-operating-system 51 (simple-operating-system
52 (service dhcp-client-service-type) 52 (service dhcpcd-service-type)
53 (service vnstat-service-type 53 (service vnstat-service-type
54 vnstat-config) 54 vnstat-config)
55 (service inetd-service-type 55 (service inetd-service-type
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm
index 84201e11c27..08151951fac 100644
--- a/gnu/tests/web.scm
+++ b/gnu/tests/web.scm
@@ -170,7 +170,7 @@ the tests."
170 170
171(define %httpd-os 171(define %httpd-os
172 (simple-operating-system 172 (simple-operating-system
173 (service dhcp-client-service-type) 173 (service dhcpcd-service-type)
174 (service httpd-service-type 174 (service httpd-service-type
175 (httpd-configuration 175 (httpd-configuration
176 (config 176 (config
@@ -199,7 +199,7 @@ the tests."
199(define %nginx-os 199(define %nginx-os
200 ;; Operating system under test. 200 ;; Operating system under test.
201 (simple-operating-system 201 (simple-operating-system
202 (service dhcp-client-service-type) 202 (service dhcpcd-service-type)
203 (service nginx-service-type 203 (service nginx-service-type
204 (nginx-configuration 204 (nginx-configuration
205 (log-directory "/var/log/nginx") 205 (log-directory "/var/log/nginx")
@@ -216,7 +216,7 @@ the tests."
216 216
217(define %nginx+anonip-os 217(define %nginx+anonip-os
218 (simple-operating-system 218 (simple-operating-system
219 (service dhcp-client-service-type) 219 (service dhcpcd-service-type)
220 (service anonip-service-type 220 (service anonip-service-type
221 (anonip-configuration 221 (anonip-configuration
222 (input "/var/run/anonip/access.log") 222 (input "/var/run/anonip/access.log")
@@ -265,7 +265,7 @@ sub vcl_synth {
265 265
266(define %varnish-os 266(define %varnish-os
267 (simple-operating-system 267 (simple-operating-system
268 (service dhcp-client-service-type) 268 (service dhcpcd-service-type)
269 ;; Pretend to be a web server that serves %index.html-contents. 269 ;; Pretend to be a web server that serves %index.html-contents.
270 (service varnish-service-type 270 (service varnish-service-type
271 (varnish-configuration 271 (varnish-configuration
@@ -314,7 +314,7 @@ echo(\"Computed by php:\".((string)(2+3)));
314(define %php-fpm-os 314(define %php-fpm-os
315 ;; Operating system under test. 315 ;; Operating system under test.
316 (simple-operating-system 316 (simple-operating-system
317 (service dhcp-client-service-type) 317 (service dhcpcd-service-type)
318 (service php-fpm-service-type) 318 (service php-fpm-service-type)
319 (service nginx-service-type 319 (service nginx-service-type
320 (nginx-configuration 320 (nginx-configuration
@@ -467,7 +467,7 @@ HTTP-PORT, along with php-fpm."
467 467
468(define %hpcguix-web-os 468(define %hpcguix-web-os
469 (simple-operating-system 469 (simple-operating-system
470 (service dhcp-client-service-type) 470 (service dhcpcd-service-type)
471 (service hpcguix-web-service-type 471 (service hpcguix-web-service-type
472 (hpcguix-web-configuration 472 (hpcguix-web-configuration
473 (specs %hpcguix-web-specs) 473 (specs %hpcguix-web-specs)
@@ -483,7 +483,7 @@ HTTP-PORT, along with php-fpm."
483(define %tailon-os 483(define %tailon-os
484 ;; Operating system under test. 484 ;; Operating system under test.
485 (simple-operating-system 485 (simple-operating-system
486 (service dhcp-client-service-type) 486 (service dhcpcd-service-type)
487 (service tailon-service-type 487 (service tailon-service-type
488 (tailon-configuration 488 (tailon-configuration
489 (config-file 489 (config-file
@@ -713,7 +713,7 @@ HTTP-PORT."
713 713
714(define (patchwork-os patchwork) 714(define (patchwork-os patchwork)
715 (simple-operating-system 715 (simple-operating-system
716 (service dhcp-client-service-type) 716 (service dhcpcd-service-type)
717 (service httpd-service-type 717 (service httpd-service-type
718 (httpd-configuration 718 (httpd-configuration
719 (config 719 (config
@@ -844,7 +844,7 @@ HTTP-PORT."
844 844
845(define %agate-os 845(define %agate-os
846 (simple-operating-system 846 (simple-operating-system
847 (service dhcp-client-service-type) 847 (service dhcpcd-service-type)
848 (simple-service 'make-agate-root activation-service-type 848 (simple-service 'make-agate-root activation-service-type
849 %make-agate-root) 849 %make-agate-root)
850 (service agate-service-type 850 (service agate-service-type