Changeset 2532 in MondoRescue

Timestamp:

Jan 8, 2010, 3:34:06 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3751@localhost: bruno | 2010-01-08 14:03:56 +0100
LVM excludion based on devices was flawed as the function targeted was not really useful. That script shold be fully rewritten to have a data structure contaiing what is needed. Anyway the current patch should allow to have some improvements

File:

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

branches/2.2.9/mindi/analyze-my-lvm

@@ -131 +131 @@
     fi
 
+    if [ "$EXCLUDE_DEVS" ] ; then
+        for ed in $EXCLUDE_DEVS ; do
+            if  [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then
+                return
+            fi
+        done
+    fi
     echo "# $LVMCMD vgcreate $current_VG$VG_params $list_of_devices"
     echo "# $LVMCMD vgchange -a y $current_VG"
@@ -143 +150 @@
         pvscan 2> /dev/null | grep '"' | cut -d'"' -f2  >  $MINDI_TMP/pv.tmp
     fi
-    if [ -f /etc/multipath.conf ]; then
-        # If multipath check which type of devidec are given, mpath prefered
-        for d in `cat  $MINDI_TMP/pv.tmp`; do
-            GiveMapperOfdm $d
-        done
-    else
-        cat $MINDI_TMP/pv.tmp
-    fi
-    rm -f $MINDI_TMP/pv.tmp
-}
-
-
-ListAllVolumeGroups() {
-    $LVMCMD vgdisplay 2> /dev/null | awk '/^ *VG Name/ {print $3;}'
-}
-
-GiveMapperOfdm () {
-
-major=`stat -c "%t" $1`
-minor=`stat -c "%T" $1`
-
-for i in `ls /dev/mapper/*`; do
-    mj=`stat -c "%t" $i`
-    mn=`stat -c "%T" $i`
-    if [ "$mj" = "$major" ] && [ "$mn" = "$minor" ]; then
-        echo "$i"
-        return
-    fi
-done
-echo $1
-}
-
-
-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 
+
+    rm -f $MINDI_TMP/pv.tmp2
+    for d in `cat $MINDI_TMP/pv.tmp`; do
         # Skip devices excluded, coming from mondoarchive
         skip=0
@@ -184 +158 @@
             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
@@ -193 +166 @@
             continue
         fi
-        # If multipath check which type of devices are given, mpath prefered
-        if [ -f /etc/multipath.conf ]; then
-            i=`GiveMapperOfdm $d`
+        echo $d >> $MINDI_TMP/pv.tmp2
+    done
+
+    if [ -f /etc/multipath.conf ]; then
+        # If multipath check which type of devidec are given, mpath prefered
+        for d in `cat $MINDI_TMP/pv.tmp2`; do
             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)"
+                    if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
                         skip=1
                         continue
@@ -209 +184 @@
                 continue
             fi
+            GiveMapperOfdm $d
+        done
+    else
+        cat $MINDI_TMP/pv.tmp2
+    fi
+    rm -f $MINDI_TMP/pv.tmp $MINDI_TMP/pv.tmp2
+}
+
+
+ListAllVolumeGroups() {
+    $LVMCMD vgdisplay 2> /dev/null | awk '/^ *VG Name/ {print $3;}'
+}
+
+GiveMapperOfdm () {
+
+major=`stat -c "%t" $1`
+minor=`stat -c "%T" $1`
+
+for i in `ls /dev/mapper/*`; do
+    mj=`stat -c "%t" $i`
+    mn=`stat -c "%T" $i`
+    if [ "$mj" = "$major" ] && [ "$mn" = "$minor" ]; then
+        echo "$i"
+        return
+    fi
+done
+echo $1
+}
+
+
+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 
+        # If multipath check which type of devices are given, mpath prefered
+        if [ -f /etc/multipath.conf ]; then
+            i=`GiveMapperOfdm $d`
             echo $i
         else