Changeset 2531 in MondoRescue

Timestamp:

Jan 8, 2010, 1:58:43 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3749@localhost: bruno | 2010-01-08 12:28:35 +0100

• Still fixing the same issues on device exclusion and LVM

Location:

branches/2.2.9/mindi

Files:

• analyze-my-lvm (modified) (2 diffs)
• mindi (modified) (1 diff)

branches/2.2.9/mindi/analyze-my-lvm

@@ -177 +177 @@
 
 ListLvmDrivesAndPartitions() {
+    # We get partitions in this loop not devices
     for d in `$LVMCMD vgdisplay -v 2> /dev/null | grep "PV Name" | sed 's/(#)//' | awk '{print $3}'`; do 
         # Skip devices excluded, coming from mondoarchive
-        if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep " $d"`" != "" ]; then
+        skip=0
+        if [ "$EXCLUDE_DEVS" ] ; then
+            for ed in $EXCLUDE_DEVS ; do
+                if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
+                    echo "Excluding $d from i-want-my-lvm (due to excluded device $ed)"
+                    skip=1
+                    continue
+                fi
+            done
+        fi
+        if [ $skip -eq 1 ]; then
             continue
         fi
@@ -185 +196 @@
         if [ -f /etc/multipath.conf ]; then
             i=`GiveMapperOfdm $d`
-            if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep " $i"`" != "" ]; then
+            skip=0
+            if [ "$EXCLUDE_DEVS" ] ; then
+                for ed in $EXCLUDE_DEVS ; do
+                    if  [ "`echo " $i " | grep " $ed"`" != "" ]; then
+                        echo "Excluding $i from i-want-my-lvm (due to excluded device $ed)"
+                        skip=1
+                        continue
+                    fi
+                done
+            fi
+            if [ $skip -eq 1 ]; then
                 continue
             fi

branches/2.2.9/mindi/mindi

@@ -1269 +1269 @@
         skip=0
         if [ "$EXCLUDE_DEVS" ] ; then
-            for d in "$EXCLUDE_DEVS" ; do
+            for d in $EXCLUDE_DEVS ; do
                 if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
                     echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
+                    skip=1
                     continue
-                    skip=1
                 fi
             done
         fi
         if [ $skip -eq 1 ]; then
-            continue
+            continue
         fi
         if [ ! "$partition_mountpt" ] ; then