[Fai-commit] r5566 - in trunk: conf debian

[Thomas Lange]

Author: lange
Date: 2009-10-20 10:06:22 +0000 (Tue, 20 Oct 2009)
New Revision: 5566

Modified:
   trunk/conf/NFSROOT
   trunk/conf/make-fai-nfsroot.conf
   trunk/debian/changelog
Log:
NFSROOT, make-fai-nfsroot.conf: remove dhcp3-client and dhcp-client,
since it's now in the default configuration of debootstrap

Modified: trunk/conf/NFSROOT
===================================================================
--- trunk/conf/NFSROOT	2009-10-20 09:02:33 UTC (rev 5565)
+++ trunk/conf/NFSROOT	2009-10-20 10:06:22 UTC (rev 5566)
@@ -1,7 +1,7 @@
 # package list for creating the NFSROOT
 
 PACKAGES aptitude
-nfs-common fai-nfsroot module-init-tools dhcp3-client ssh rdate lshw portmap
+nfs-common fai-nfsroot module-init-tools ssh rdate lshw portmap
 bootpc rsync lftp less dump reiserfsprogs e2fsprogs usbutils
 hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
 dnsutils ntpdate dosfstools cvs jove xfsprogs xfsdump

Modified: trunk/conf/make-fai-nfsroot.conf
===================================================================
--- trunk/conf/make-fai-nfsroot.conf	2009-10-20 09:02:33 UTC (rev 5565)
+++ trunk/conf/make-fai-nfsroot.conf	2009-10-20 10:06:22 UTC (rev 5566)
@@ -33,4 +33,4 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # following lines should be read only for most of you
 
-FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
+FAI_DEBOOTSTRAP_OPTS="--exclude=info"

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-20 09:02:33 UTC (rev 5565)
+++ trunk/debian/changelog	2009-10-20 10:06:22 UTC (rev 5566)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta22) unstable; urgency=low
+fai (3.2.23~beta23) unstable; urgency=low
 
   [ Thomas Lange ]
   * subroutines-linux: fix log message
@@ -92,6 +92,8 @@
   * fai: check if make-fai-nfsroot.conf is available if dirinstall is used
   * control: update to standards version 3.8.3, no changes needed
   * Fstab.pm: print uuid and label of partition to console
+  * NFSROOT, make-fai-nfsroot.conf: remove dhcp3-client and dhcp-client,
+    since it's now in the default configuration of debootstrap
   
   [ Michael Tautschnig ]
   * setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell
@@ -133,7 +135,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Mon, 19 Oct 2009 17:01:05 +0200
+ -- Thomas Lange <lange at debian.org>  Tue, 20 Oct 2009 12:05:58 +0200
 
 fai (3.2.20) unstable; urgency=low