summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2026-08-26 13:26:40 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2026-08-26 13:30:40 +0900
commitbddb1ece34331637454a8c2281e625ab829ef204 (patch)
tree2e02a56325a5d8bf764e8b8af016292c8abe810e /gnu
parent463ef2011c6f31f0c40a24fa0d7ce50acd8d332b (diff)
maint: Replace remaining usages of isc-dhcp with dhcpcd.
isc-dhcp has been unmaintained since 2022. This is a follow-up to commit 3e713ae41c73b352fad4830b23721ee07935c512. * doc/guix.texi (Keyboard Layout and Networking and Partitioning): Adjust example. * etc/manifests/cross-compile.scm (%system-packages) * etc/manifests/release-desktop.scm (%desktop-packages) * etc/manifests/release-minimal.scm (%system-packages): Replace "isc-dhcp" with "dhcpcd". * gnu/system.scm (%base-packages-networking): Likewise. * gnu/tests/install.scm (%simple-installation-script) (%extlinux-gpt-installation-script) (%simple-installation-script-for-/dev/vda) (%separate-store-installation-script) (%extra-encrypted-packages): Likewise.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/build/install.scm2
-rw-r--r--gnu/system.scm2
-rw-r--r--gnu/tests/install.scm10
3 files changed, 7 insertions, 7 deletions
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index d0717f204af..58ee77d1831 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -134,7 +134,7 @@ STORE."
134 (directory "/var/log") ; for shepherd 134 (directory "/var/log") ; for shepherd
135 (directory "/var/guix/gcroots") 135 (directory "/var/guix/gcroots")
136 (directory "/var/empty") ; for no-login accounts 136 (directory "/var/empty") ; for no-login accounts
137 (directory "/var/db") ; for dhclient, etc. 137 (directory "/var/db") ; for dhcpcd, etc.
138 (directory "/mnt") 138 (directory "/mnt")
139 (directory "/var/guix/profiles/per-user/root" 0 0) 139 (directory "/var/guix/profiles/per-user/root" 0 0)
140 140
diff --git a/gnu/system.scm b/gnu/system.scm
index d2db4ea8f52..14b4cab4b22 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -977,7 +977,7 @@ of PROVENANCE-SERVICE-TYPE to its services."
977 977
978(define %base-packages-networking 978(define %base-packages-networking
979 ;; Default set of networking packages. 979 ;; Default set of networking packages.
980 (list inetutils isc-dhcp 980 (list inetutils dhcpcd
981 iproute 981 iproute
982 wget 982 wget
983 nss-certs 983 nss-certs
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 25e4cc85a05..91ab59ce8d2 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -170,7 +170,7 @@ set -e -x
170guix --version 170guix --version
171 171
172export GUIX_BUILD_OPTIONS=--no-grafts 172export GUIX_BUILD_OPTIONS=--no-grafts
173guix build isc-dhcp 173guix build dhcpcd
174parted --script /dev/vdb mklabel gpt \\ 174parted --script /dev/vdb mklabel gpt \\
175 mkpart primary ext2 1M 3M \\ 175 mkpart primary ext2 1M 3M \\
176 mkpart primary ext2 3M 2G \\ 176 mkpart primary ext2 3M 2G \\
@@ -196,7 +196,7 @@ set -e -x
196guix --version 196guix --version
197 197
198export GUIX_BUILD_OPTIONS=--no-grafts 198export GUIX_BUILD_OPTIONS=--no-grafts
199guix build isc-dhcp 199guix build dhcpcd
200parted --script /dev/vdb mklabel gpt \\ 200parted --script /dev/vdb mklabel gpt \\
201 mkpart primary ext2 1M 2G \\ 201 mkpart primary ext2 1M 2G \\
202 set 1 legacy_boot on 202 set 1 legacy_boot on
@@ -468,7 +468,7 @@ set -e -x
468guix --version 468guix --version
469 469
470export GUIX_BUILD_OPTIONS=--no-grafts 470export GUIX_BUILD_OPTIONS=--no-grafts
471guix build isc-dhcp 471guix build dhcpcd
472parted --script /dev/vda mklabel gpt \\ 472parted --script /dev/vda mklabel gpt \\
473 mkpart primary ext2 1M 3M \\ 473 mkpart primary ext2 1M 3M \\
474 mkpart primary ext2 3M 2G \\ 474 mkpart primary ext2 3M 2G \\
@@ -597,7 +597,7 @@ set -e -x
597guix --version 597guix --version
598 598
599export GUIX_BUILD_OPTIONS=--no-grafts 599export GUIX_BUILD_OPTIONS=--no-grafts
600guix build isc-dhcp 600guix build dhcpcd
601parted --script /dev/vdb mklabel gpt \\ 601parted --script /dev/vdb mklabel gpt \\
602 mkpart primary ext2 1M 3M \\ 602 mkpart primary ext2 1M 3M \\
603 mkpart primary ext2 3M 400M \\ 603 mkpart primary ext2 3M 400M \\
@@ -1974,7 +1974,7 @@ build (current-guix) and then store a couple of full system images.")
1974 1974
1975(define %extra-encrypted-packages 1975(define %extra-encrypted-packages
1976 ;; Packages needed when installing with an encrypted root. 1976 ;; Packages needed when installing with an encrypted root.
1977 (list isc-dhcp 1977 (list dhcpcd
1978 lvm2-static cryptsetup-static e2fsck/static 1978 lvm2-static cryptsetup-static e2fsck/static
1979 loadkeys-static grub-efi fatfsck/static dosfstools)) 1979 loadkeys-static grub-efi fatfsck/static dosfstools))
1980 1980