Timeout here is not a good idea. rootfs cannot be mounted and kernel oopses due to...

[projects/geninitrd.git] / mod-lvm.sh

diff --git a/mod-lvm.sh b/mod-lvm.sh
index 4ba0f40dd08bc12e7523bb67106ed735d0b8b522..99abd4225132cf17f3a765abefdfcdb0c56df72b 100644 (file)
--- 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