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

[Michael Prokop]

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

Modified:
   branches/stable/3.4/bin/make-fai-nfsroot
   branches/stable/3.4/debian/changelog
Log:
make-fai-nfsroot: fix typo, remove redundant rm command


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:42 UTC (rev 5992)
+++ branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:54:49 UTC (rev 5993)
@@ -363,7 +363,6 @@
     [ -f etc/init/tty1.conf ] || ln -s /usr/sbin/fai etc/init.d/rcS
     find etc/init ! -type d | egrep -v "fai|udev|hostname|mountall|mounted" | xargs -r rm
 
-    rm -f etc/udev/rules.d/70-persistent-net.rules 
     # definition for loopback device
     echo "iface lo inet loopback" > etc/network/interfaces
 

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:54:42 UTC (rev 5992)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:54:49 UTC (rev 5993)
@@ -4,7 +4,7 @@
   * dhcp-edit: new command that adds or removes entries to/from dhcpd.conf
     add $modified, add more messages, fix code for adding a host
   * make-fai-nfsroot.conf: set NFSROOT_HOOKS by default
-  * make-fai-nfsroot: fix typo
+  * make-fai-nfsroot: fix typo, remove redundant rm command
   * mkramdisk: use exit in main routine (closes: #583289)
   * ainsl: exit with 0 if line already exists in the file
   * sources.list: fix security.geo.debian.org domain entries