From: Michael Prokop <mika@grml.org>
Date: Sun, 27 Nov 2011 01:31:11 +0000 (+0100)
Subject: SW: replace dhcp3-client with isc-dhcp-client
X-Git-Tag: v0.17.0~35
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=090c35d7097cf9921038d8c83f77adabe83a676b

SW: replace dhcp3-client with isc-dhcp-client

dhcp3-client is a transitional package, so let's get rid of it
and use its dependency isc-dhcp-client instead.
---

diff --git a/etc/grml/fai/NFSROOT b/etc/grml/fai/NFSROOT
index c76333c..0577542 100644
--- a/etc/grml/fai/NFSROOT
+++ b/etc/grml/fai/NFSROOT
@@ -1,7 +1,7 @@
 # package list for creating the NFSROOT
 
 PACKAGES install
-fai-nfsroot module-init-tools dhcp3-client ssh rdate lshw hwinfo portmap
+fai-nfsroot module-init-tools isc-dhcp-client ssh rdate lshw hwinfo portmap
 bootpc rsync lftp rsh-client less dump reiserfsprogs usbutils
 hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
 dnsutils ntpdate dosfstools xfsprogs xfsdump
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 4aa8da4..9ab5c4d 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -133,7 +133,6 @@ avahi-daemon
 bind9-host
 bridge-utils
 cdpr
-dhcp3-client
 dnsmasq
 ethstatus
 ethtool
@@ -148,6 +147,7 @@ iptraf
 iputils-arping
 iputils-ping
 iputils-tracepath
+isc-dhcp-client
 iw
 libnss-mdns
 mtr-tiny
diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 05aa58f..91ced35 100644
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -32,7 +32,6 @@ debconf-i18n
 debconf-utils
 debianutils
 debootstrap
-dhcp3-client
 dialog
 diffutils
 dmraid
@@ -75,6 +74,7 @@ iptraf
 iptstate
 iputils-ping
 irqbalance
+isc-dhcp-client
 iw
 jed
 jed-common
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 2cbbd74..60bb8e4 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -25,7 +25,6 @@ ddrescue
 debconf
 debconf-i18n
 debianutils
-dhcp3-client
 dialog
 diffutils
 dmraid
@@ -49,6 +48,7 @@ imvirt
 inetutils-inetd
 iproute
 iputils-ping
+isc-dhcp-client
 iw
 jed
 jed-common
diff --git a/etc/grml/fai/config/package_config/GRML_XL b/etc/grml/fai/config/package_config/GRML_XL
index f6723a1..a2b2207 100644
--- a/etc/grml/fai/config/package_config/GRML_XL
+++ b/etc/grml/fai/config/package_config/GRML_XL
@@ -298,7 +298,6 @@ detox
 devio
 devscripts
 devtodo
-dhcp3-client
 dhcp3-server
 dhcpdump
 dhcping
@@ -616,6 +615,7 @@ irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
+isc-dhcp-client
 iscsitarget
 isdnutils-base
 isdnvboxclient