[readonly/geninitrd: 492/1068] - lvm needs to be called lvm.static otherwise it will re-execute itself via /sbin/lvm

[draenog]

commit 903f21ea1b33f90fef09eef9ceb42971744e8cb3
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Oct 31 18:10:23 2007 +0000

    - lvm needs to be called lvm.static otherwise it will re-execute itself via /sbin/lvm
    
    svn-id: @8917

 geninitrd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index b5afa24..20c8ceb 100755
--- a/geninitrd
+++ b/geninitrd
@@ -199,7 +199,7 @@ mount_tmp() {
 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_nfs() {
 
 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 @@ initrd_gen_lvm() {
 
 			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
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/147754ca159d40ca5eb541074dc043d8cbd92090