[Fai-commit] r5660 - in trunk: . conf debian

[Thomas Lange]

Author: lange
Date: 2009-11-14 00:15:11 +0000 (Sat, 14 Nov 2009)
New Revision: 5660

Added:
   trunk/conf/upstart-fai.conf
Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/fai-nfsroot.dirs
   trunk/debian/fai-nfsroot.install
Log:
* upstart-fai.conf: new file for starting fai via upstart
* fai-nfsroot.dirs, fai-nfsroot.install, Makefile: add upstart files

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-11-14 00:06:23 UTC (rev 5659)
+++ trunk/Makefile	2009-11-14 00:15:11 UTC (rev 5660)
@@ -25,7 +25,7 @@
 install: 
 	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp3,apt/apt.conf.d}
 	mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
-	mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/usr/share/fai/{pixmaps,setup-storage}
+	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps,setup-storage}
 	install man/* $(DESTDIR)/man
 	$(MAKE) -C doc install
 	-install $(libfiles) $(LIBDIR)
@@ -42,6 +42,7 @@
 	install -m644 conf/NFSROOT $(DESTDIR)/etc/fai
 	install -m644 conf/fai_modules_off $(DESTDIR)/etc/modutils
 	install -m644 conf/menu.lst.boot-only $(DESTDIR)/usr/share/fai/menu.lst
+	install -m644 conf/upstart-fai.conf $(DESTDIR)/etc/init/fai.conf
 	install -m755 lib/fai-abort $(DESTDIR)/etc/init.d
 	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
 	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai

Added: trunk/conf/upstart-fai.conf
===================================================================
--- trunk/conf/upstart-fai.conf	                        (rev 0)
+++ trunk/conf/upstart-fai.conf	2009-11-14 00:15:11 UTC (rev 5660)
@@ -0,0 +1,12 @@
+# fai - start the fully automatic installation
+
+description	"start fully automatic installation"
+
+start on (startup
+      	 and filesystem
+	 and started udev)
+
+console output
+
+task
+exec /usr/sbin/fai

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-11-14 00:06:23 UTC (rev 5659)
+++ trunk/debian/changelog	2009-11-14 00:15:11 UTC (rev 5660)
@@ -5,7 +5,9 @@
   * Commands.pm: add ext4 support for tune2fs
   * Fstab: do not fsck swap partitions
   * fai,make-fai-nfsroot: add upstart support
-
+  * upstart-fai.conf: new file for starting fai via upstart
+  * fai-nfsroot.dirs, fai-nfsroot.install, Makefile: add upstart files
+  
  -- Thomas Lange <lange at debian.org>  Fri, 13 Nov 2009 17:37:07 +0100
 
 fai (3.3) unstable; urgency=low

Modified: trunk/debian/fai-nfsroot.dirs
===================================================================
--- trunk/debian/fai-nfsroot.dirs	2009-11-14 00:06:23 UTC (rev 5659)
+++ trunk/debian/fai-nfsroot.dirs	2009-11-14 00:15:11 UTC (rev 5660)
@@ -1,4 +1,5 @@
 etc/fai
+etc/init
 etc/dhcp3
 etc/init.d
 etc/apt/apt.conf.d

Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install	2009-11-14 00:06:23 UTC (rev 5659)
+++ trunk/debian/fai-nfsroot.install	2009-11-14 00:15:11 UTC (rev 5660)
@@ -10,4 +10,5 @@
 etc/dhcp3/dhclient-fai.conf
 etc/apt/apt.conf.d/90fai
 etc/init.d/fai-abort
+etc/init/fai.conf
 etc/modutils/fai_modules_off