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

[Thomas Lange]

Author: lange
Date: 2010-07-09 13:51:52 +0000 (Fri, 09 Jul 2010)
New Revision: 5851

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: add test if etc/init is available

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-07-09 11:16:40 UTC (rev 5850)
+++ trunk/bin/make-fai-nfsroot	2010-07-09 13:51:52 UTC (rev 5851)
@@ -361,7 +361,9 @@
     ln -sf /usr/share/zoneinfo/$timezone etc/localtime
     ln -sf /proc/mounts etc/mtab
     [ -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
+    if [ -d etc/init ]; then   # if upstart is available
+	find etc/init ! -type d | egrep -v "fai|udev|hostname|mountall|mounted" | xargs -r rm
+    fi
 
     # definition for loopback device
     echo "iface lo inet loopback" > etc/network/interfaces

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-09 11:16:40 UTC (rev 5850)
+++ trunk/debian/changelog	2010-07-09 13:51:52 UTC (rev 5851)
@@ -31,6 +31,7 @@
   * fai-client.install: remove list_disks
   * 10-misc, subroutines: move adding /etc/hosts entry from task_prepareapt
     to config space script, add only if host does not belong to class DHCPC
+  * make-fai-nfsroot: add test if etc/init is available
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks