Changeset 2244 in MondoRescue

Timestamp:

Jul 1, 2009, 5:09:10 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Remove inactive vg from lvmscan output really in analyze-my-lvm
• Do not exit abruptly in any case in analyze-my-lvm when detecting an analysis issue, but return instead.

File:

• branches/2.2.9/mindi/analyze-my-lvm (modified) (3 diffs)

branches/2.2.9/mindi/analyze-my-lvm

@@ -32 +32 @@
     local LV_full_string fname logical_volume volume_group device
     LV_full_string=$1
-    [ ! -e "$1" ] && Die "Cannot find LV file $1"
+    if [ ! -e "$1" ]; then
+        echo "WARNING - cannot find LV file $1" | tee -a /dev/stderr
+        return
+    fi
     volume_group=`echo "$LV_full_string" | cut -d'/' -f3`
     logical_volume=`echo "$LV_full_string" | cut -d'/' -f4`
@@ -41 +44 @@
         fname=/proc/lvm/VGs/$volume_group/LVs/$logical_volume
         if [ ! -e "$fname" ] ; then
-            echo "Warning - cannot find $volume_group's $logical_volume LV file"
+            echo "WARNING - cannot find $volume_group's $logical_volume LV file" | tee -a /dev/stderr
+            return
         else
             device=`GetValueFromField $fname "name:"`
@@ -198 +202 @@
 ListAllLogicalVolumes() {
     if [ $lvmversion = 2 ]; then
-        $LVMCMD lvscan 2> /dev/null | grep "'" | grep -i "ACTIVE" | cut -d"'" -f2
-    else
-        lvscan 2> /dev/null | grep '"' | grep -i "ACTIVE" | cut -d'"' -f2
+        $LVMCMD lvscan 2> /dev/null | grep "'" | grep -iw "ACTIVE" | cut -d"'" -f2
+    else
+        lvscan 2> /dev/null | grep '"' | grep -iw "ACTIVE" | cut -d'"' -f2
     fi
 }