Changeset 2530 in MondoRescue for branches/2.2.9/mindi

Timestamp:

Jan 8, 2010, 1:18:29 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3747@localhost: bruno | 2010-01-08 11:48:24 +0100

• Still fixing issues related to 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

@@ -179 +179 @@
     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
+        if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep " $d"`" != "" ]; then
             continue
         fi
@@ -185 +185 @@
         if [ -f /etc/multipath.conf ]; then
             i=`GiveMapperOfdm $d`
-            if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep " $i "`" ]; then
+            if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep " $i"`" != "" ]; then
                 continue
             fi

branches/2.2.9/mindi/mindi

@@ -1267 +1267 @@
             fi
         fi
+        skip=0
         if [ "$EXCLUDE_DEVS" ] ; then
             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
-                    continue
+                    continue
+                    skip=1
                 fi
             done
+        fi
+        if [ $skip -eq 1 ]; then
+            continue
         fi
         if [ ! "$partition_mountpt" ] ; then