Changeset 2566 in MondoRescue

Timestamp:

Feb 1, 2010, 5:07:15 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Now supports also excludion of LVs directly
• Improve mindi by handling excluded devices earlier in the loop.

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

@@ -51 +51 @@
         fi
     fi
+
+    # Exclude LVs member of that env var
+    if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+        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"
+                return
+            fi
+        done
+    fi
     # Do not process LV whose VG are excluded
     if [ -f $MINDI_TMP/excludedvgs ]; then
-        if [ "`grep $volume_group $MINDI_TMP/excludedvgs`" = "" ]; then
-            echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
-        else
+        if [ "`grep $volume_group $MINDI_TMP/excludedvgs`" != "" ]; then
             echo "Not including LV $logical_volume as VG $volume_group was excluded"
-        fi
-    else
-        echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
-    fi
+            return
+        fi
+    fi
+
+    echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
 }
 

branches/2.2.9/mindi/mindi

@@ -1187 +1187 @@
         fi
 
+        # Look for devices which have to be excluded
+        skip=0
+        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+            for d in $MINDI_EXCLUDE_DEVS ; do
+                if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
+                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
+                    skip=1
+                    continue
+                fi
+            done
+        fi
+        if [ $skip -eq 1 ]; then
+            continue
+        fi
+
         partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
         # Some distributions such as Debian do not put /dev/<VG>/<LV> in fstab
@@ -1268 +1283 @@
             fi
         fi
-        skip=0
-        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
-            for d in $MINDI_EXCLUDE_DEVS ; do
-                if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
-                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
-                    skip=1
-                    continue
-                fi
-            done
-        fi
-        if [ $skip -eq 1 ]; then
-            continue
-        fi
+
         if [ ! "$partition_mountpt" ] ; then
             echo "------- $FDISK -l $qq log ------------" >> $LOGFILE