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

[Thomas Lange]

Author: lange
Date: 2009-11-13 22:09:32 +0000 (Fri, 13 Nov 2009)
New Revision: 5658

Modified:
   trunk/bin/fai
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
fai,make-fai-nfsroot: add upstart support

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2009-11-13 21:39:24 UTC (rev 5657)
+++ trunk/bin/fai	2009-11-13 22:09:32 UTC (rev 5658)
@@ -92,9 +92,9 @@
 
     if [ $do_init_tasks -eq 1 ]; then
 	eval_cmdline
-	mount -t sysfs sysfs /sys
+	[ -d /sys/kernel ] || mount -t sysfs sysfs /sys
 	# we really need to start udev
-	[ -x /etc/init.d/udev ] && /etc/init.d/udev start
+	[ -x /etc/init.d/udev ] && [ X$UPSTART_JOB != Xfai ] && /etc/init.d/udev start
 	mkdir -p /var/run/network /dev/shm/network # when using initrd kernels
 	ifup lo
 	[ -x /sbin/portmap ] && /sbin/portmap
@@ -271,7 +271,7 @@
 
 # are we called as an init substitute ?
 export do_init_tasks=0
-[ "$0" = "/etc/init.d/rcS" ] && do_init_tasks=1
+[ "$0" = "/etc/init.d/rcS" ] || [ X$UPSTART_JOB = Xfai ] && do_init_tasks=1
 if [ $do_init_tasks -eq 1 ]; then
     hostname $HOSTNAME
     renewclass=1 # always renew class list when installing

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-11-13 21:39:24 UTC (rev 5657)
+++ trunk/bin/make-fai-nfsroot	2009-11-13 22:09:32 UTC (rev 5658)
@@ -338,11 +338,10 @@
     # set timezone in nfsroot
     timezone=$(readlink /etc/localtime | sed 's%^/usr/share/zoneinfo/%%')
     echo $timezone > etc/timezone 
-    rm -f etc/localtime && ln -sf /usr/share/zoneinfo/$timezone etc/localtime
+    ln -sf /usr/share/zoneinfo/$timezone etc/localtime
+    ln -sf /proc/mounts etc/mtab
+    [ -d etc/init ] || ln -s /usr/sbin/fai etc/init.d/rcS
 
-    rm etc/mtab && ln -s /proc/mounts etc/mtab
-    ln -s /usr/sbin/fai etc/init.d/rcS
-
     rm -f etc/udev/rules.d/70-persistent-net.rules 
     # definition for loopback device
     echo "iface lo inet loopback" > etc/network/interfaces

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-11-13 21:39:24 UTC (rev 5657)
+++ trunk/debian/changelog	2009-11-13 22:09:32 UTC (rev 5658)
@@ -4,6 +4,7 @@
   * doc/Makefile: add target chunked
   * Commands.pm: add ext4 support for tune2fs
   * Fstab: do not fsck swap partitions
+  * fai,make-fai-nfsroot: add upstart support
 
  -- Thomas Lange <lange at debian.org>  Fri, 13 Nov 2009 17:37:07 +0100