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

[Thomas Lange]

Author: lange
Date: 2010-02-01 20:31:08 +0000 (Mon, 01 Feb 2010)
New Revision: 5716

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
  do not remove upstart scripts mounted-*, needed for Ubuntu lucid

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-02-01 16:25:14 UTC (rev 5715)
+++ trunk/bin/make-fai-nfsroot	2010-02-01 20:31:08 UTC (rev 5716)
@@ -341,7 +341,7 @@
     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" | xargs -r rm
+    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

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-02-01 16:25:14 UTC (rev 5715)
+++ trunk/debian/changelog	2010-02-01 20:31:08 UTC (rev 5716)
@@ -1,4 +1,4 @@
-fai (3.3.3) unstable; urgency=low
+fai (3.3.3~beta2) unstable; urgency=low
 
   [ Thomas Lange ]
   * lib/mkramdisk: new script that mounts a ramdisk onto a directory and
@@ -18,6 +18,7 @@
     Goetz for the bug report and the patch (closes: #558139)
   * mount2dir, subroutines: handle mount errors (closes: #557082)
   * make-fai-nfsroot: ignore backup files when executing hooks
+    do not remove upstart scripts mounted-*, needed for Ubuntu lucid
   * install_packages: add support for zypper (install and remove packages)
     (closes: #514160)
   * fai-debconf: ignore files that cannot match a class name
@@ -39,7 +40,7 @@
   * setup-storage/Commands.pm: Add -q to createopts when making reiser file
     systems (thanks Mathieu Alorent and Thomas Neumann).
 
- -- Thomas Lange <lange at debian.org>  Thu, 28 Jan 2010 18:11:22 +0100
+ -- Thomas Lange <lange at debian.org>  Mon, 01 Feb 2010 21:28:30 +0100
 
 fai (3.3.2) unstable; urgency=low