From 39405f7981455798c45cc1beb26c579efb018b8f Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Mon, 21 Jul 2025 19:54:42 +0200 Subject: [PATCH] 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 --- gnu/tests/audio.scm | 2 +- gnu/tests/avahi.scm | 2 +- gnu/tests/ci.scm | 2 +- gnu/tests/containers.scm | 2 +- gnu/tests/cups.scm | 2 +- gnu/tests/databases.scm | 2 +- gnu/tests/dict.scm | 2 +- gnu/tests/dns.scm | 2 +- gnu/tests/docker.scm | 4 ++-- gnu/tests/file-sharing.scm | 2 +- gnu/tests/guix.scm | 8 ++++---- gnu/tests/install.scm | 2 +- gnu/tests/ldap.scm | 2 +- gnu/tests/lightdm.scm | 2 +- gnu/tests/mail.scm | 8 ++++---- gnu/tests/messaging.scm | 10 +++++----- gnu/tests/monitoring.scm | 4 ++-- gnu/tests/networking.scm | 8 ++++---- gnu/tests/nfs.scm | 4 ++-- gnu/tests/package-management.scm | 2 +- gnu/tests/rsync.scm | 2 +- gnu/tests/samba.scm | 4 ++-- gnu/tests/ssh.scm | 2 +- gnu/tests/telephony.scm | 2 +- gnu/tests/upnp.scm | 2 +- gnu/tests/version-control.scm | 8 ++++---- gnu/tests/virtualization.scm | 4 ++-- gnu/tests/vnstat.scm | 2 +- gnu/tests/web.scm | 18 +++++++++--------- 29 files changed, 58 insertions(+), 58 deletions(-) diff --git a/gnu/tests/audio.scm b/gnu/tests/audio.scm index acb91293e8300c8d9b98e82d92ea61f12160534c..fc29acf5e6010597c07626a97ac5828423e0d95a 100644 --- a/gnu/tests/audio.scm +++ b/gnu/tests/audio.scm @@ -82,7 +82,7 @@ (define (run-mympd-test) (define os (marionette-operating-system - (simple-operating-system (service dhcp-client-service-type) + (simple-operating-system (service dhcpcd-service-type) (service mympd-service-type)) #:imported-modules '((gnu services herd)))) diff --git a/gnu/tests/avahi.scm b/gnu/tests/avahi.scm index fd6941a29250e5b8e3076f9af304454a47c32599..323103212477ffbe61fdb0c268f0c06de227485a 100644 --- a/gnu/tests/avahi.scm +++ b/gnu/tests/avahi.scm @@ -43,7 +43,7 @@ (services (cons* (service avahi-service-type (avahi-configuration (debug? #t))) (service dbus-root-service-type) - (service dhcp-client-service-type) ;needed for multicast + (service dhcpcd-service-type) ;needed for multicast ;; Enable heavyweight debugging output. (modify-services (operating-system-user-services diff --git a/gnu/tests/ci.scm b/gnu/tests/ci.scm index 5294514c667f366d19e20d7cbe5438f6dbc1fd89..a9310c6201d3a4e4569c110791d4b83005c5e4c3 100644 --- a/gnu/tests/ci.scm +++ b/gnu/tests/ci.scm @@ -38,7 +38,7 @@ (define %laminar-os ;; Operating system under test. (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service laminar-service-type))) (define* (run-laminar-test #:optional (http-port 8080)) diff --git a/gnu/tests/containers.scm b/gnu/tests/containers.scm index 0ecc8ddb126a4bd1ec6aa2d422eacfd3c55d7204..618da2a92ce9bcffe124ca0b09951f200596020d 100644 --- a/gnu/tests/containers.scm +++ b/gnu/tests/containers.scm @@ -51,7 +51,7 @@ (subuids (list (subid-range (name "dummy")))))) - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service dbus-root-service-type) (service polkit-service-type) (service elogind-service-type) diff --git a/gnu/tests/cups.scm b/gnu/tests/cups.scm index 4c7d78b7c85f4d79bdccffb7988b10e687602936..81e344299ec64c6b48b4380fb1c9ceae66ae36b7 100644 --- a/gnu/tests/cups.scm +++ b/gnu/tests/cups.scm @@ -84,7 +84,7 @@ (define %cups-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service cups-service-type (cups-configuration (web-interface? #t) diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm index 0b2a8acfbba129893d5b14e78e57f5e97e47d478..4d4ed1004dd9aa17279cf5d520ef7e4ee0147e60 100644 --- a/gnu/tests/databases.scm +++ b/gnu/tests/databases.scm @@ -42,7 +42,7 @@ (define %memcached-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service memcached-service-type))) (define* (run-memcached-test #:optional (port 11211)) diff --git a/gnu/tests/dict.scm b/gnu/tests/dict.scm index f02bd5ac9909a68a082192db633004ddeec16722..1596d54b2835c3b3032f6b11394ef36fae368a5c 100644 --- a/gnu/tests/dict.scm +++ b/gnu/tests/dict.scm @@ -34,7 +34,7 @@ (define %dicod-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service dicod-service-type (dicod-configuration (interfaces '("0.0.0.0")) diff --git a/gnu/tests/dns.scm b/gnu/tests/dns.scm index ff42456760c291ebda9df38ca9cab1f4f0fe0b75..c737b5bf6439242d18b3605b6d82fd781b82b262 100644 --- a/gnu/tests/dns.scm +++ b/gnu/tests/dns.scm @@ -31,7 +31,7 @@ ;; TODO: Unbound config (let ((base-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service unbound-service-type (unbound-configuration (server diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 90c8d0f8508c0c888feec7fa6620127dcf7760e7..8952daab2f5689f576a59347563fa0c273b14bb2 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -50,7 +50,7 @@ (define %docker-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service dbus-root-service-type) (service polkit-service-type) (service elogind-service-type) @@ -352,7 +352,7 @@ docker-image} inside Docker.") (define %oci-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service dbus-root-service-type) (service polkit-service-type) (service elogind-service-type) diff --git a/gnu/tests/file-sharing.scm b/gnu/tests/file-sharing.scm index d1343e2ebaa9c66875475b268f832bb461248086..fd8431e9883a68ff92308742d030e301258ebe13 100644 --- a/gnu/tests/file-sharing.scm +++ b/gnu/tests/file-sharing.scm @@ -71,7 +71,7 @@ (define os (marionette-operating-system (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service transmission-daemon-service-type %transmission-daemon-test-configuration)) #:imported-modules '((gnu services herd) diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm index fbc779828c44c4ea9b1aa623421b4cb8a7e21369..14982cf1b5c17372634840453b0f58ac0b406d56 100644 --- a/gnu/tests/guix.scm +++ b/gnu/tests/guix.scm @@ -49,7 +49,7 @@ (define %guix-build-coordinator-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service guix-build-coordinator-service-type))) (define (run-guix-build-coordinator-test) @@ -155,7 +155,7 @@ (define %guix-data-service-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service postgresql-service-type (postgresql-configuration (postgresql postgresql) @@ -331,7 +331,7 @@ host all all ::1/128 trust")))))) (define %nar-herder-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service nar-herder-service-type (nar-herder-configuration (host "0.0.0.0") @@ -407,7 +407,7 @@ host all all ::1/128 trust")))))) (define %bffe-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service guix-build-coordinator-service-type) (service bffe-service-type (bffe-configuration diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 97c3505fb097c781ff043f0b2fd21e66593dba69..ec31cf2bdf5973baf6339819afec8da14630daef 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.") (list (swap-space (target (uuid "11111111-2222-3333-4444-123456789abc")))))) - (services (cons* (service dhcp-client-service-type) + (services (cons* (service dhcpcd-service-type) (service ntp-service-type) (operating-system-user-services %minimal-os-on-vda))))) diff --git a/gnu/tests/ldap.scm b/gnu/tests/ldap.scm index 2cf7491f3e59ca1ed707ddd507c3407e14f837f8..4c79079d28a3c1e8cd3a34b2c3d8c35aad8b12d4 100644 --- a/gnu/tests/ldap.scm +++ b/gnu/tests/ldap.scm @@ -33,7 +33,7 @@ (define %ldap-os (let ((simple (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service nslcd-service-type)))) (operating-system (inherit simple) diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm index 0fd809a9844408feaeda29846c9e4b21c0932f96..fd5c77677e1349ad3364b8896aa5867d8071cfb1 100644 --- a/gnu/tests/lightdm.scm +++ b/gnu/tests/lightdm.scm @@ -77,7 +77,7 @@ (user-session "ratpoison")))))) ;; For debugging. - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service openssh-service-type (openssh-configuration (permit-root-login #t) diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index 4ebee3ef99798e915c1ba27e599f996d9afd4dec..07a4487d7858479f8da14d1a17712352153d6980 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -46,7 +46,7 @@ (define %opensmtpd-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service opensmtpd-service-type (opensmtpd-configuration (config-file @@ -170,7 +170,7 @@ match from any for local action inbound (define %exim-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service mail-aliases-service-type '()) (service exim-service-type (exim-configuration @@ -294,7 +294,7 @@ acl_check_data: (define %dovecot-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service dovecot-service-type (dovecot-configuration (extensions (list dovecot-pigeonhole)) @@ -474,7 +474,7 @@ addheader \"X-Sieve-Filtered\" \"Guix\"; (supplementary-groups '("wheel" "audio" "video"))) %base-user-accounts)) - (services (cons* (service dhcp-client-service-type) + (services (cons* (service dhcpcd-service-type) (service dovecot-service-type (dovecot-configuration (disable-plaintext-auth? #f) diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm index 8df67433a7ff821145d3ce93ce744607903a1401..f1f4247c58214b3dd10a9dd41a63ae444957a7cd 100644 --- a/gnu/tests/messaging.scm +++ b/gnu/tests/messaging.scm @@ -48,7 +48,7 @@ "Run a test of an OS running XMPP-SERVICE, which writes its PID to PID-FILE." (define os (marionette-operating-system - (simple-operating-system (service dhcp-client-service-type) + (simple-operating-system (service dhcpcd-service-type) xmpp-service) #:imported-modules '((gnu services herd)))) @@ -177,7 +177,7 @@ (define (run-bitlbee-test) (define os (marionette-operating-system - (simple-operating-system (service dhcp-client-service-type) + (simple-operating-system (service dhcpcd-service-type) (service bitlbee-service-type (bitlbee-configuration (interface "0.0.0.0")))) @@ -239,7 +239,7 @@ (packages (cons* ii screen %base-packages)) (services (cons* - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service ngircd-service-type (ngircd-configuration (debug? #t) @@ -403,7 +403,7 @@ %base-packages)) (services (cons* - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service ngircd-tls-cert-service-type) (service ngircd-service-type (ngircd-configuration @@ -549,7 +549,7 @@ OPENSSL:localhost:7000,verify=0 &") (define (run-quassel-test) (define os (marionette-operating-system - (simple-operating-system (service dhcp-client-service-type) + (simple-operating-system (service dhcpcd-service-type) (service quassel-service-type)) #:imported-modules (source-module-closure '((gnu services herd))))) diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm index a9545410ecd3626ef7cdac2d3d6ee476698f8b11..6db2b2c0087f5050dd0ea3bf951e4f5a8a3913e0 100644 --- a/gnu/tests/monitoring.scm +++ b/gnu/tests/monitoring.scm @@ -91,7 +91,7 @@ (define %prometheus-node-exporter-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service prometheus-node-exporter-service-type (prometheus-node-exporter-configuration)))) @@ -303,7 +303,7 @@ zabbix||{} ;; Return operating system under test. (let ((base-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service postgresql-service-type (postgresql-configuration (postgresql postgresql))) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 2865e6ff3505e8fd08d68d8e09fd416ffaeaca6e..b640d8c67a2f368461e3748e25b74fb3738ac9d3 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -359,7 +359,7 @@ passed an invalid device.") (define %inetd-os ;; Operating system with 2 inetd services. (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service inetd-service-type (inetd-configuration (entries (list @@ -692,7 +692,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (define %dnsmasq-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service dnsmasq-service-type (dnsmasq-configuration (extra-options @@ -996,7 +996,7 @@ COMMIT (define os (marionette-operating-system (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service inetd-service-type (inetd-configuration (entries (list @@ -1100,7 +1100,7 @@ COMMIT (define (make-nftables-os ruleset) (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service inetd-service-type (inetd-configuration (entries (list diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index c08f7186a28ca048a990fa8ffc2279dd9a920c7a..0453d453820d097d31e460632673267a91efec2a 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -60,7 +60,7 @@ %base-packages)) (services (cons* (service rpcbind-service-type) - (service dhcp-client-service-type) + (service dhcpcd-service-type) %base-services)))) (define (run-nfs-test name socket) @@ -148,7 +148,7 @@ (mkdir "/remote") (chmod "/remote" #o777) #t)) - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service nfs-service-type (nfs-configuration (debug '(nfs nfsd mountd)) diff --git a/gnu/tests/package-management.scm b/gnu/tests/package-management.scm index 6d61dea4f80e2a7d583739631cbb9f6413d7daf6..c5102fff74d151472962abf9b838b39a63e704f9 100644 --- a/gnu/tests/package-management.scm +++ b/gnu/tests/package-management.scm @@ -99,7 +99,7 @@ (let ((base-os (simple-operating-system (service nix-service-type) - (service dhcp-client-service-type)))) + (service dhcpcd-service-type)))) (operating-system (inherit base-os) (packages (cons nix (operating-system-packages base-os)))))) diff --git a/gnu/tests/rsync.scm b/gnu/tests/rsync.scm index 182e5f76ffdc627cd71a426e29779ac6db9a4cc4..8194713ad3f6a2b60cbe3a9afbcfab45eb5f4081 100644 --- a/gnu/tests/rsync.scm +++ b/gnu/tests/rsync.scm @@ -136,7 +136,7 @@ PORT." ;; Return operating system under test. (let ((base-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service rsync-service-type (rsync-configuration (modules (list (rsync-module diff --git a/gnu/tests/samba.scm b/gnu/tests/samba.scm index cb2762a90e423997ef00c5b440a1ee1ac26f03f0..db9f27c9ce2291d0b6b151cd7523e6d636e360ff 100644 --- a/gnu/tests/samba.scm +++ b/gnu/tests/samba.scm @@ -42,7 +42,7 @@ (chown "/srv/samba/guest" (passwd:uid (getpw "nobody")) (passwd:gid (getpw "nobody"))))) - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service samba-service-type (samba-configuration (config-file (plain-file "smb.conf" " @@ -165,7 +165,7 @@ (define %wsdd-os (let ((base-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service wsdd-service-type)))) (operating-system (inherit base-os) diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm index 4882c7a88b13c8ed04f0f8ee834330118964624b..21f098ad669f35c15bb91a63e4613bf46799ae1a 100644 --- a/gnu/tests/ssh.scm +++ b/gnu/tests/ssh.scm @@ -40,7 +40,7 @@ empty-password logins. When SFTP? is true, run an SFTP server test." (define os (marionette-operating-system - (simple-operating-system (service dhcp-client-service-type) ssh-service) + (simple-operating-system (service dhcpcd-service-type) ssh-service) #:imported-modules '((gnu services herd) (guix combinators)))) (define vm diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm index f03ea963f7eb1a505aab83b2e83cbea7f9a83c47..ef5474bef0b0d4b809d344f89147b5e3010b4882 100644 --- a/gnu/tests/telephony.scm +++ b/gnu/tests/telephony.scm @@ -111,7 +111,7 @@ (service dbus-root-service-type) ;; The following services/packages are added for ;; debugging purposes. - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service openssh-service-type (openssh-configuration (permit-root-login #t) diff --git a/gnu/tests/upnp.scm b/gnu/tests/upnp.scm index 0224557f40100fc2495358d36eb8fce810610309..079df6c777126f94b7c6028ca3c721e813b139ab 100644 --- a/gnu/tests/upnp.scm +++ b/gnu/tests/upnp.scm @@ -47,7 +47,7 @@ (define os (marionette-operating-system (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service readymedia-service-type %readymedia-configuration-test)) #:imported-modules '((gnu services herd) diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 18c68a58f28bcb09cfa67a173e9a9d5402c2ffd7..08863ebc3e9241a00505ffea333b129a502f6ce9 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -96,7 +96,7 @@ ;; Operating system under test. (let ((base-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service cgit-service-type (cgit-configuration (nginx %cgit-configuration-nginx))) @@ -230,7 +230,7 @@ HTTP-PORT." (define %git-http-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service fcgiwrap-service-type) (service nginx-service-type %git-nginx-configuration) %test-repository-service)) @@ -318,7 +318,7 @@ HTTP-PORT." (define %gitolite-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service openssh-service-type) (service gitolite-service-type (gitolite-configuration @@ -415,7 +415,7 @@ HTTP-PORT." (define %gitile-os ;; Operating system under test. (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (simple-service 'srv-git activation-service-type #~(mkdir-p "/srv/git")) (service gitile-service-type diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index e08f66eb281c90c9ea9671211e6b9c7f3e7e6d0f..c55a944845ff9a71ccf617bbf5b0c672d2fca655 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -54,7 +54,7 @@ (define %libvirt-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service dbus-root-service-type) (service polkit-service-type) (service libvirt-service-type))) @@ -266,7 +266,7 @@ (define %childhurd-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service hurd-vm-service-type (hurd-vm-configuration (os (operating-system diff --git a/gnu/tests/vnstat.scm b/gnu/tests/vnstat.scm index c498b987ffd2f328535469e41bd5f03ac9e45d96..7228d3d22b30e3cc03e3ac1a676790b26bb15dcf 100644 --- a/gnu/tests/vnstat.scm +++ b/gnu/tests/vnstat.scm @@ -49,7 +49,7 @@ (define os (marionette-operating-system (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service vnstat-service-type vnstat-config) (service inetd-service-type diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 84201e11c27052bdfd83de5e8f250455e36cc2db..08151951fac7fa0970b81614f2759d8c8bea1ec1 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -170,7 +170,7 @@ the tests." (define %httpd-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service httpd-service-type (httpd-configuration (config @@ -199,7 +199,7 @@ the tests." (define %nginx-os ;; Operating system under test. (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service nginx-service-type (nginx-configuration (log-directory "/var/log/nginx") @@ -216,7 +216,7 @@ the tests." (define %nginx+anonip-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service anonip-service-type (anonip-configuration (input "/var/run/anonip/access.log") @@ -265,7 +265,7 @@ sub vcl_synth { (define %varnish-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) ;; Pretend to be a web server that serves %index.html-contents. (service varnish-service-type (varnish-configuration @@ -314,7 +314,7 @@ echo(\"Computed by php:\".((string)(2+3))); (define %php-fpm-os ;; Operating system under test. (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service php-fpm-service-type) (service nginx-service-type (nginx-configuration @@ -467,7 +467,7 @@ HTTP-PORT, along with php-fpm." (define %hpcguix-web-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service hpcguix-web-service-type (hpcguix-web-configuration (specs %hpcguix-web-specs) @@ -483,7 +483,7 @@ HTTP-PORT, along with php-fpm." (define %tailon-os ;; Operating system under test. (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service tailon-service-type (tailon-configuration (config-file @@ -713,7 +713,7 @@ HTTP-PORT." (define (patchwork-os patchwork) (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (service httpd-service-type (httpd-configuration (config @@ -844,7 +844,7 @@ HTTP-PORT." (define %agate-os (simple-operating-system - (service dhcp-client-service-type) + (service dhcpcd-service-type) (simple-service 'make-agate-root activation-service-type %make-agate-root) (service agate-service-type