tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: tests: Replace deprecated dhcp client service.

Browse Source 
* 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
This commit is contained in:
Gabriel Wicki
2025-07-21 19:54:42 +02:00
parent aea73f5b74
commit 39405f7981
29 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/tests/audio.scm
View File

@@ -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))))

2
gnu/tests/avahi.scm
View File

@@ -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

2
gnu/tests/ci.scm
View File

@@ -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))

2
gnu/tests/containers.scm
View File

@@ -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)

2
gnu/tests/cups.scm
View File

@@ -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)

2
gnu/tests/databases.scm
View File

@@ -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))

2
gnu/tests/dict.scm
View File

@@ -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"))

2
gnu/tests/dns.scm
View File

@@ -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

4
gnu/tests/docker.scm
View File

@@ -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)

2
gnu/tests/file-sharing.scm
View File

@@ -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)

8
gnu/tests/guix.scm
View File

@@ -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

2
gnu/tests/install.scm
View File

@@ -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)))))

2
gnu/tests/ldap.scm
View File

@@ -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)

2
gnu/tests/lightdm.scm
View File

@@ -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)

8
gnu/tests/mail.scm
View File

@@ -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)

10
gnu/tests/messaging.scm
View File

@@ -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)))))

4
gnu/tests/monitoring.scm
View File

@@ -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)))

8
gnu/tests/networking.scm
View File

@@ -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

4
gnu/tests/nfs.scm
View File

@@ -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))

2
gnu/tests/package-management.scm
View File

@@ -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))))))

2
gnu/tests/rsync.scm
View File

@@ -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

4
gnu/tests/samba.scm
View File

@@ -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)

2
gnu/tests/ssh.scm
View File

@@ -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

2
gnu/tests/telephony.scm
View File

@@ -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)

2
gnu/tests/upnp.scm
View File

@@ -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)

8
gnu/tests/version-control.scm
View File

@@ -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

4
gnu/tests/virtualization.scm
View File

@@ -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

2
gnu/tests/vnstat.scm
View File

@@ -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

18
gnu/tests/web.scm
View File

@@ -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