M gnu/tests/audio.scm => gnu/tests/audio.scm +1 -1
@@ 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))))
M gnu/tests/avahi.scm => gnu/tests/avahi.scm +1 -1
@@ 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
M gnu/tests/ci.scm => gnu/tests/ci.scm +1 -1
@@ 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))
M gnu/tests/containers.scm => gnu/tests/containers.scm +1 -1
@@ 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)
M gnu/tests/cups.scm => gnu/tests/cups.scm +1 -1
@@ 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)
M gnu/tests/databases.scm => gnu/tests/databases.scm +1 -1
@@ 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))
M gnu/tests/dict.scm => gnu/tests/dict.scm +1 -1
@@ 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"))
M gnu/tests/dns.scm => gnu/tests/dns.scm +1 -1
@@ 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
M gnu/tests/docker.scm => gnu/tests/docker.scm +2 -2
@@ 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)
M gnu/tests/file-sharing.scm => gnu/tests/file-sharing.scm +1 -1
@@ 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)
M gnu/tests/guix.scm => gnu/tests/guix.scm +4 -4
@@ 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
M gnu/tests/install.scm => gnu/tests/install.scm +1 -1
@@ 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)))))
M gnu/tests/ldap.scm => gnu/tests/ldap.scm +1 -1
@@ 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)
M gnu/tests/lightdm.scm => gnu/tests/lightdm.scm +1 -1
@@ 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)
M gnu/tests/mail.scm => gnu/tests/mail.scm +4 -4
@@ 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)
M gnu/tests/messaging.scm => gnu/tests/messaging.scm +5 -5
@@ 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)))))
M gnu/tests/monitoring.scm => gnu/tests/monitoring.scm +2 -2
@@ 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)))
M gnu/tests/networking.scm => gnu/tests/networking.scm +4 -4
@@ 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
M gnu/tests/nfs.scm => gnu/tests/nfs.scm +2 -2
@@ 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))
M gnu/tests/package-management.scm => gnu/tests/package-management.scm +1 -1
@@ 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))))))
M gnu/tests/rsync.scm => gnu/tests/rsync.scm +1 -1
@@ 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
M gnu/tests/samba.scm => gnu/tests/samba.scm +2 -2
@@ 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)
M gnu/tests/ssh.scm => gnu/tests/ssh.scm +1 -1
@@ 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
M gnu/tests/telephony.scm => gnu/tests/telephony.scm +1 -1
@@ 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)
M gnu/tests/upnp.scm => gnu/tests/upnp.scm +1 -1
@@ 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)
M gnu/tests/version-control.scm => gnu/tests/version-control.scm +4 -4
@@ 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
M gnu/tests/virtualization.scm => gnu/tests/virtualization.scm +2 -2
@@ 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
M gnu/tests/vnstat.scm => gnu/tests/vnstat.scm +1 -1
@@ 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
M gnu/tests/web.scm => gnu/tests/web.scm +9 -9
@@ 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