[Fai-commit] r5985 - in branches/stable/3.4: bin debian

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:54:10 +0000 (Tue, 17 Aug 2010)
New Revision: 5985

Modified:
   branches/stable/3.4/bin/make-fai-nfsroot
   branches/stable/3.4/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)


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/bin/make-fai-nfsroot
===================================================================
--- branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:54:06 UTC (rev 5984)
+++ branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:54:10 UTC (rev 5985)
@@ -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: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:54:06 UTC (rev 5984)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:54:10 UTC (rev 5985)
@@ -19,7 +19,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)