Changeset 2536 in MondoRescue for branches

Timestamp:

Jan 8, 2010, 4:49:02 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3759@localhost: bruno | 2010-01-08 15:18:49 +0100

• Finally the function ListLvmDrivesAndPartitions is used, as it creates info parsed by mindi !! So reverting back to filter excluded devices in it

Location:

branches/2.2.9/mindi

Files:

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

branches/2.2.9/mindi/analyze-my-lvm

@@ -226 +226 @@
         if [ -f /etc/multipath.conf ]; then
             i=`GiveMapperOfdm $d`
-            echo $i
+            rep=$i
         else
-            echo $d
-        fi
+            rep=$d
+        fi
+        skip=0
+        if [ "$EXCLUDE_DEVS" ] ; then
+            for ed in $EXCLUDE_DEVS ; do
+                if  [ "`echo " $rep " | grep " $ed"`" != "" ]; then
+                    skip=1
+                    continue
+                fi
+            done
+        fi
+        if [ $skip -eq 1 ]; then
+            continue
+        fi
+        echo $rep
     done
 }

branches/2.2.9/mindi/mindi

@@ -993 +993 @@
             LVM="false"
         fi
+        # Excluded LVs and GVs are not reported here
         all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
-#    echo "all partitions = $all_partitions" > /dev/stderr
     for i in $IMAGE_DEVS ; do
         mount | grep -F "$i " > /dev/null 2> /dev/null && Die "Sorry, $i is already mounted! CANNOT DO IMAGEDEV on it if it's mounted."