Changeset 2424 in MondoRescue for branches/2.2.9/mindi

Timestamp:

Sep 25, 2009, 6:44:01 PM (15 years ago)

Author:

Bruno Cornec

Message:

• analyze-my-lvm now removes excluded devices from list coming from mondoarchive
• new mr_make_devlist_from_pathlist which handle the new bkpinfo->exclude_devs field containing the excluded devices and remove corresponding code from libmondo-cli.c
• Move DSF code into libmondo-devices.c for coherency, and only the previous function is made externally available
• Remove dev_to_exclude in libmondo-archive.c which wasn't working correctly and replace it with bkpinfo->exclude_devs

Location:

branches/2.2.9/mindi

Files:

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

branches/2.2.9/mindi/analyze-my-lvm

@@ -177 +177 @@
 
 ListLvmDrivesAndPartitions() {
-    $LVMCMD vgdisplay -v 2> /dev/null | grep "PV Name" | sed 's/(#)//' | awk '{print $3}' > $MINDI_TMP/vg.tmp
-    if [ -f /etc/multipath.conf ]; then
-        # If multipath check which type of devidec are given, mpath prefered
-        for d in `cat  $MINDI_TMP/vg.tmp`; do
+    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
+            continue
+        fi
+        # If multipath check which type of devides are given, mpath prefered
+        if [ -f /etc/multipath.conf ]; then
             GiveMapperOfdm $d
-        done
-    else
-        cat $MINDI_TMP/vg.tmp
-    fi
-    rm -f $MINDI_TMP/vg.tmp
+        else
+            echo $d
+        fi
+    done
 }
 

branches/2.2.9/mindi/mindi

@@ -999 +999 @@
             LVM="false"
         fi
-        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-32`
+        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -2765 +2765 @@
         LAST_FILELIST_NUMBER=${12}
         ESTIMATED_TOTAL_NOOF_SLICES=${13}
-        EXCLUDE_DEVS="${14}"
+        export EXCLUDE_DEVS="${14}"
         USE_COMP="${15}"
         USE_LILO="${16}"