SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Wed Oct 31 19:10:23 2007
New Revision: 8917

Modified:
   geninitrd/trunk/geninitrd
Log:
- lvm needs to be called lvm.static otherwise it will re-execute itself via /sbin/lvm

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Oct 31 19:10:23 2007
@@ -199,7 +199,7 @@
 umount_all() {
 
 	add_linuxrc <<-'EOF'
-	: Last shell before umounting all and giving control over to real init
+	: Last shell before umounting all and giving control over to real init.
 	debugshell
 	EOF
 
@@ -1611,8 +1611,8 @@
 
 initrd_gen_lvm() {
 	debug "Adding LVM support to initrd"
-	inst /sbin/initrd-lvm /bin/lvm
 	inst_d /etc /tmp /proc /newroot
+	inst /sbin/initrd-lvm /bin/lvm.static
 
 	# always make /dev on tmpfs for LVM2
 	if [ "$LVMTOOLSVERSION" = "2" ]; then
@@ -1677,10 +1677,10 @@
 
 			export LVM_SYSTEM_DIR=/tmp
 			: 'Scanning for Volume Groups'
-			lvm vgscan --mknodes --ignorelockingfailure 2>/dev/null
+			lvm.static vgscan --mknodes --ignorelockingfailure 2>/dev/null
 
 			: 'Activating Volume Groups'
-			lvm vgchange --ignorelockingfailure -a y $LVM_VGVOLUME 2>/dev/null
+			lvm.static vgchange --ignorelockingfailure -a y $LVM_VGVOLUME 2>/dev/null
 
 			echo "$printk" > /proc/sys/kernel/printk