[Fai-commit] r5834 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2010-07-04 09:18:14 +0000 (Sun, 04 Jul 2010)
New Revision: 5834

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: remove etc/hostname and 70-persistent-net.rules from
nfsroot and base.tgz (thanks to Manuel Hachtkemper for the patch)

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-07-03 23:27:40 UTC (rev 5833)
+++ trunk/bin/make-fai-nfsroot	2010-07-04 09:18:14 UTC (rev 5834)
@@ -275,7 +275,7 @@
     if [ "$FAI_DEBOOTSTRAP" ]; then
         call_with_stamp call_debootstrap $FAI_DEBOOTSTRAP
         $ROOTCMD apt-get clean
-	rm -f $NFSROOT/etc/resolv.conf
+	rm -f $NFSROOT/etc/resolv.conf $NFSROOT/etc/hostname $NFSROOT/etc/udev/rules.d/70-persistent-net.rules
         echo "Creating base.tgz"
         tar --one-file-system -C $NFSROOT -cf - --exclude var/tmp/base.tgz --exclude 'var/lib/apt/lists/*_*' . | gzip > $NFSROOT/var/tmp/base.tgz
 	touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-03 23:27:40 UTC (rev 5833)
+++ trunk/debian/changelog	2010-07-04 09:18:14 UTC (rev 5834)
@@ -20,7 +20,9 @@
   * fai-chboot,fai-chboot.8: add option -P
   * setup-storage.8: add info about flag_initial
   * doc/error-levels: describe error levels of task_error subroutine
-  
+  * make-fai-nfsroot: remove etc/hostname and 70-persistent-net.rules from
+    nfsroot and base.tgz (thanks to Manuel Hachtkemper for the patch)
+    
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks
     Michael Prokop <mika at debian.org> for the patch (closes: #575812)