From e7ada958c302e9ca5c2fafffefe265c51723b26e Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 30 Jun 2023 13:33:26 +0200
Subject: [PATCH] SW: switch from isc-dhcp-client to dhcpcd
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

ISC DHCP (AKA isc-dhcp-client in Debian) is no longer maintained by ISC,
see https://kb.isc.org/docs/isc-dhcp-eol-dates and also
https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.en.html#deprecated-components

Note that this also needs adjustments in FAI_DEBOOTSTRAP_OPTS, as
debootstrap by default pulls ins isc-dhcp-client and isc-dhcp-common via
ifupdown, due to its `Recommends: isc-dhcp-client | dhcp-client`.

Thanks: András Korn for the suggestion
---
 etc/grml/fai/config/package_config/GRML_FULL  | 2 +-
 etc/grml/fai/config/package_config/GRML_SMALL | 2 +-
 grml-live                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index b81e4bd..13b2007 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -159,6 +159,7 @@ bridge-utils
 cdpr
 cifs-utils
 cloud-init
+dhcpcd
 dnsmasq
 dnsutils
 ethstatus
@@ -178,7 +179,6 @@ iptstate
 iputils-arping
 iputils-ping
 iputils-tracepath
-isc-dhcp-client
 iw
 libnss-mdns
 libteam-utils
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index c14651d..e2b3849 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -16,6 +16,7 @@ cpio
 cryptsetup
 cu
 dctrl-tools
+dhcpcd
 diffutils
 disktype
 dmraid
@@ -40,7 +41,6 @@ iperf3
 iproute2
 iptstate
 iputils-ping
-isc-dhcp-client
 iw
 jfsutils
 kexec-tools
diff --git a/grml-live b/grml-live
index 65c9417..f62c75e 100755
--- a/grml-live
+++ b/grml-live
@@ -712,7 +712,7 @@ if [ -z "$FAI_DEBOOTSTRAP" ] ; then
 fi
 
 if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then
-  FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data --include=aptitude --arch $ARCH"
+  FAI_DEBOOTSTRAP_OPTS="--exclude=info,tasksel,tasksel-data,isc-dhcp-client,isc-dhcp-common --include=aptitude --arch $ARCH"
 fi
 
 # create backup of old (not yet automatically generated) config file
-- 
2.1.4