[Fai-commit] r5697 - in trunk: conf debian

[Thomas Lange]

Author: lange
Date: 2010-01-15 11:27:35 +0000 (Fri, 15 Jan 2010)
New Revision: 5697

Modified:
   trunk/conf/upstart-fai.conf
   trunk/debian/changelog
Log:
upstart.conf: fix timing issue (thanks to Waldemar Brodkorb for the
patch)

Modified: trunk/conf/upstart-fai.conf
===================================================================
--- trunk/conf/upstart-fai.conf	2010-01-13 19:59:20 UTC (rev 5696)
+++ trunk/conf/upstart-fai.conf	2010-01-15 11:27:35 UTC (rev 5697)
@@ -2,9 +2,7 @@
 
 description	"start fully automatic installation"
 
-start on (startup
-      	 and filesystem
-	 and started udev)
+start on local-filesystems
 
 console output
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-13 19:59:20 UTC (rev 5696)
+++ trunk/debian/changelog	2010-01-15 11:27:35 UTC (rev 5697)
@@ -5,6 +5,8 @@
     copies its contents to the ramdisk, can also umount the ramdisk and
     put the modified contents back to the hard disks, this script is a
     modified version of mkrw from FAI 3.1.8.
+  * upstart.conf: fix timing issue (thanks to Waldemar Brodkorb for the
+    patch)
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.2
@@ -21,7 +23,7 @@
   * disk-info, setup-storage/Init.pm: Also accept Xen's xvd[a-t] as valid disk
     name (thanks Rudy Gevaert for the patch). (closes: #561489)
 
- -- Thomas Lange <lange at debian.org>  Tue, 12 Jan 2010 14:32:41 +0100
+ -- Thomas Lange <lange at debian.org>  Fri, 15 Jan 2010 12:27:11 +0100
 
 fai (3.3.2) unstable; urgency=low