Changeset 2567 in MondoRescue

Timestamp:

Feb 1, 2010, 6:10:24 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Improve device exclusion for LVM by adding support for symlinks and mapper systematically at all levels (PV, VG, LV). Should really provvide the best support possible for LVM exclusion.

File:

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

branches/2.2.9/mindi/analyze-my-lvm

@@ -54 +54 @@
     # Exclude LVs member of that env var
     if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+        list_of_devices="`mindi --readalllink $LV_full_string`"
+        l=""
+        for d in $list_of_devices; do
+            l="$l `GiveMapperOfdm $d`"
+        done
+        list_of_devices="`echo $l | sort -u`"
         for ed in $MINDI_EXCLUDE_DEVS ; do
-            list_of_devices="`GiveMapperOfdm $LV_full_string`"
             if  [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then
                 echo "Not including device $LV_full_string as it was excluded"
@@ -143 +148 @@
     l=""
     if [ -f /etc/multipath.conf ]; then
-        # If multipath check which type of devidec are given, mpath prefered
+        # If multipath check which type of devide are given, mpath prefered
         for d in $list_of_devices; do
+            l="$l `mindi --readalllink $d`"
             l="$l `GiveMapperOfdm $d`"
         done
-        list_of_devices=$l
+        list_of_devices="`echo $l | sort -u`"
     fi
 
@@ -172 +178 @@
 
     rm -f $MINDI_TMP/pv.tmp2
+    l=""
     for d in `cat $MINDI_TMP/pv.tmp`; do
         # Skip devices excluded, coming from mondoarchive
         skip=0
+        l="$l `mindi --readalllink $d`"
+        l="$l `GiveMapperOfdm $d`"
+        list_of_devices="`echo $l | sort -u`"
         if [ "$MINDI_EXCLUDE_DEVS" ] ; then
             for ed in $MINDI_EXCLUDE_DEVS ; do
-                if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
+                if  [ "`echo " $list_of_devices " | grep " $ed"`" != "" ]; then
                     skip=1
                     continue
@@ -190 +200 @@
 
     if [ -f /etc/multipath.conf ]; then
-        # If multipath check which type of devidec are given, mpath prefered
+        # If multipath check which type of devide are given, mpath prefered
         if [ -f  $MINDI_TMP/pv.tmp2 ]; then
+            l=""
             for d in `cat $MINDI_TMP/pv.tmp2`; do
                 skip=0
+                l="$l `mindi --readalllink $d`"
+                l="$l `GiveMapperOfdm $d`"
+                list_of_devices="`echo $l | sort -u`"
                 if [ "$MINDI_EXCLUDE_DEVS" ] ; then
                     for ed in $MINDI_EXCLUDE_DEVS ; do
-                        if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
+                        if  [ "`echo " $list_of_devices " | grep " $ed"`" != "" ]; then
                             skip=1
                             continue