X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mod-lvm.sh;h=99abd4225132cf17f3a765abefdfcdb0c56df72b;hb=ad5033d7e704edaf52f2be18d4aa98c378179ede;hp=4ba0f40dd08bc12e7523bb67106ed735d0b8b522;hpb=f87179eb4f0ee657c14d1f3d37beca6dcab87f40;p=projects%2Fgeninitrd.git

diff --git a/mod-lvm.sh b/mod-lvm.sh
index 4ba0f40..99abd42 100644
--- a/mod-lvm.sh
+++ b/mod-lvm.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
-LVM_RCSID='$Revision$ $Date::                            $'
-
 # geninitrd mod: LVM
 USE_LVM=${USE_LVM:-yes}
 
@@ -71,7 +69,7 @@ is_lvm() {
 	rc=$?
 	if [ $rc -gt 127 ]; then
 		# lvdisplay terminated by signal! most likely it segfaulted.
-		die "Unexpected exit from 'lvdisplay $node': $rc - are your lvm tools broken?"
+		die "Unexpected exit from '$lvm lvdisplay $node': $rc - are your lvm tools broken?"
 	fi
 
 	return $rc
@@ -141,7 +139,6 @@ initrd_gen_lvm() {
 		done
 	fi
 
-	mount_tmp
 	mount_sys
 	if [ "$LVMTOOLSVERSION" = "1" ]; then
 		add_linuxrc <<-EOF
@@ -237,14 +234,18 @@ initrd_gen_lvm() {
 			fi
 
 			export LVM_SYSTEM_DIR=/tmp
+
 			: 'Scanning for Volume Groups'
 			lvm.static vgscan --mknodes --ignorelockingfailure
 
 			: 'Activating Volume Groups'
 			for vol in $LVM_VGVOLUMES; do
-				lvm.static vgchange --ignorelockingfailure -a y $vol
+				lvm.static vgchange --ignorelockingfailure -a y $vol --noudevsync
 			done
 
+			: 'Extra call to make device nodes for non lvm2-initrd (dynamic lvm2)'
+			lvm.static vgmknodes --ignorelockingfailure
+
 			echo "$printk" > /proc/sys/kernel/printk
 
 			# Find out major/minor