- check LVM tools version only if lvm is enabled. lp#359718

svn-id: @10326

diff --git a/mod-lvm.sh b/mod-lvm.sh
index d3999b3a21b9608d3bc9e5cfc0ff00a68ce19352..845896aacdf061050cce1850680771b7326f34a2 100644 (file)
--- a/mod-lvm.sh
+++ b/mod-lvm.sh
@@ -29,15 +29,15 @@ setup_mod_lvm() {
        lvm=$(find_tool $initrd_dir/lvm /sbin/initrd-lvm)
        if [ -x /sbin/lvm -a -x "$lvm" ]; then
                USE_LVM=yes
-       else
-               USE_LVM=no
-       fi
 
-       if [ -z "$LVMTOOLSVERSION" ]; then
-               LVMTOOLSVERSION=$(LC_ALL=C $lvm vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
                if [ -z "$LVMTOOLSVERSION" ]; then
-                       die "Can't determine LVM tools version. Please set LVMTOOLSVERSION and rerun $PROGRAM."
+                       LVMTOOLSVERSION=$(LC_ALL=C $lvm vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
+                       if [ -z "$LVMTOOLSVERSION" ]; then
+                               die "Can't determine LVM tools version. Please set LVMTOOLSVERSION and rerun $PROGRAM."
+                       fi
                fi
+       else
+               USE_LVM=no
        fi
 }
 
@@ -84,10 +84,6 @@ find_modules_lvm() {
 
        debug "LVM: $devpath is LVM node"
 
-       if [ ! -x $lvm -o ! -x /sbin/lvdisplay -o ! -x /sbin/pvdisplay ]; then
-               die "root on LVM but /sbin/lvdisplay or /sbin/pvdisplay not found. Please install lvm(2) and lvm(2)-initrd package and rerun $PROGRAM."
-       fi
-
        local vg=$(find_lvm_vg "$devpath")
        debug "LVM VG for $devpath: $vg"
        VGVOLUMES=$(echo $VGVOLUMES $vg | tr ' ' '\n' | sort -u)