guix_mirror_bot pushed a commit to branch master
in repository guix.
commit bddb1ece34331637454a8c2281e625ab829ef204
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Wed Aug 26 13:26:40 2026 +0900
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.
---
doc/guix.texi | 2 +-
etc/manifests/cross-compile.scm | 2 +-
etc/manifests/release-desktop.scm | 2 +-
etc/manifests/release-minimal.scm | 2 +-
gnu/build/install.scm | 2 +-
gnu/system.scm | 2 +-
gnu/tests/install.scm | 10 +++++-----
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 8ab25d734c..49ae745d83 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2647,7 +2647,7 @@ At this point, you need to acquire an IP address. On a
network where IP
addresses are automatically assigned @i{via} DHCP, you can run:
@example
-dhclient -v @var{interface}
+dhcpcd @var{interface}
@end example
Try to ping a server to see if networking is up and running:
diff --git a/etc/manifests/cross-compile.scm b/etc/manifests/cross-compile.scm
index c74e62ab10..9094ac40ad 100644
--- a/etc/manifests/cross-compile.scm
+++ b/etc/manifests/cross-compile.scm
@@ -68,7 +68,7 @@ TARGET."
;; Key packages proposed by the Guix System installer.
(map specification->package
'("openssh" "tor" "ntp" "gpm"
- "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups"
+ "connman" "network-manager" "wpa-supplicant" "dhcpcd" "cups"
"linux-libre" "grub-hybrid")))
(define (%system-gui-packages target)
diff --git a/etc/manifests/release-desktop.scm
b/etc/manifests/release-desktop.scm
index 89175418bc..09c03e6e21 100644
--- a/etc/manifests/release-desktop.scm
+++ b/etc/manifests/release-desktop.scm
@@ -117,7 +117,7 @@
"usbutils"
"util-linux-with-udev"
"kmod"
- "isc-dhcp"
+ "dhcpcd"
"iproute2"
"wget"
"nss-certs"
diff --git a/etc/manifests/release-minimal.scm
b/etc/manifests/release-minimal.scm
index 5a1f3dcdc8..d1c4fe3acc 100644
--- a/etc/manifests/release-minimal.scm
+++ b/etc/manifests/release-minimal.scm
@@ -48,7 +48,7 @@ TARGET."
(append (map specification->package
'("guix" "shepherd" "guile-static-initrd"
"openssh" "tor" "ntp" "gpm" "mingetty"
- "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups"
+ "connman" "network-manager" "wpa-supplicant" "dhcpcd" "cups"
"linux-libre" "grub-hybrid"
;; privileged programs
"shadow" "sudo" "fuse" "inetutils" "util-linux"))
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index d0717f204a..58ee77d183 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -134,7 +134,7 @@ STORE."
(directory "/var/log") ; for shepherd
(directory "/var/guix/gcroots")
(directory "/var/empty") ; for no-login accounts
- (directory "/var/db") ; for dhclient, etc.
+ (directory "/var/db") ; for dhcpcd, etc.
(directory "/mnt")
(directory "/var/guix/profiles/per-user/root" 0 0)
diff --git a/gnu/system.scm b/gnu/system.scm
index d2db4ea8f5..14b4cab4b2 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -977,7 +977,7 @@ of PROVENANCE-SERVICE-TYPE to its services."
(define %base-packages-networking
;; Default set of networking packages.
- (list inetutils isc-dhcp
+ (list inetutils dhcpcd
iproute
wget
nss-certs
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 25e4cc85a0..91ab59ce8d 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -170,7 +170,7 @@ set -e -x
guix --version
export GUIX_BUILD_OPTIONS=--no-grafts
-guix build isc-dhcp
+guix build dhcpcd
parted --script /dev/vdb mklabel gpt \\
mkpart primary ext2 1M 3M \\
mkpart primary ext2 3M 2G \\
@@ -196,7 +196,7 @@ set -e -x
guix --version
export GUIX_BUILD_OPTIONS=--no-grafts
-guix build isc-dhcp
+guix build dhcpcd
parted --script /dev/vdb mklabel gpt \\
mkpart primary ext2 1M 2G \\
set 1 legacy_boot on
@@ -468,7 +468,7 @@ set -e -x
guix --version
export GUIX_BUILD_OPTIONS=--no-grafts
-guix build isc-dhcp
+guix build dhcpcd
parted --script /dev/vda mklabel gpt \\
mkpart primary ext2 1M 3M \\
mkpart primary ext2 3M 2G \\
@@ -597,7 +597,7 @@ set -e -x
guix --version
export GUIX_BUILD_OPTIONS=--no-grafts
-guix build isc-dhcp
+guix build dhcpcd
parted --script /dev/vdb mklabel gpt \\
mkpart primary ext2 1M 3M \\
mkpart primary ext2 3M 400M \\
@@ -1974,7 +1974,7 @@ build (current-guix) and then store a couple of full
system images.")
(define %extra-encrypted-packages
;; Packages needed when installing with an encrypted root.
- (list isc-dhcp
+ (list dhcpcd
lvm2-static cryptsetup-static e2fsck/static
loadkeys-static grub-efi fatfsck/static dosfstools))
