[Fai-commit] r6446 - branches/stable/3.4/bin

[Michael Prokop]

Author: mika
Date: 2011-04-15 18:14:50 +0000 (Fri, 15 Apr 2011)
New Revision: 6446

Modified:
   branches/stable/3.4/bin/make-fai-nfsroot
Log:
make-fai-nfsroot: Remove Ubuntu-specific lib/udev/rules.d/85-lvm2.rules to avoid LVM auto-start

Automatically starting volumes as they become available will confuse
setup-storage, which might subsequently remove such partitions.

(cherry picked from commit 545836458dcba37c8d6b6082c41db926c2216a4a)

Modified: branches/stable/3.4/bin/make-fai-nfsroot
===================================================================
--- branches/stable/3.4/bin/make-fai-nfsroot	2011-04-15 18:14:44 UTC (rev 6445)
+++ branches/stable/3.4/bin/make-fai-nfsroot	2011-04-15 18:14:50 UTC (rev 6446)
@@ -366,6 +366,9 @@
 
     # this second rm of the same file is needed!
     rm -f etc/udev/rules.d/70-persistent-net.rules 
+    # remove Ubuntu-specific rules to auto-start volume groups, which confuses
+    # setup-storage
+    rm -f lib/udev/rules.d/85-lvm2.rules
     # definition for loopback device
     echo "iface lo inet loopback" > etc/network/interfaces