Changeset 2529 in MondoRescue

Timestamp:

Jan 8, 2010, 12:23:27 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3745@localhost: bruno | 2010-01-08 10:53:15 +0100

• Do not report Duplicate mount point when lvm is used
• each device of the EXCLUDE_DEVS list is now used correctly and partitions found on this device are excluded

File:

• branches/2.2.9/mindi/mindi (modified) (2 diffs)

branches/2.2.9/mindi/mindi

@@ -1267 +1267 @@
             fi
         fi
-        if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep -F " $current_partition "`" ] || [ "`echo " $EXCLUDE_DEVS " | grep " $current_partition "`" ] ; then
-            echo "Excluding $current_partition from mountlist" >> $LOGFILE
-            continue
+        if [ "$EXCLUDE_DEVS" ] ; then
+            for d in "$EXCLUDE_DEVS" ; do
+                if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
+                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
+                    continue
+                fi
+            done
         fi
         if [ ! "$partition_mountpt" ] ; then
@@ -1324 +1328 @@
     local file=$1
     # Coherency verification
-    ML0=`cat $file | wc -l`
+    ML01=`cat $file | wc -l`
+    ML02=`cat $file | grep -v ' lvm ' | wc -l`
     ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
-    ML2=`$AWK '{print $2}' $file | sort -u | wc -l`
-    if [ "$ML0" -ne "$ML1" ]; then
+    ML2=`$AWK '{print $2}' $file | grep -v ' lvm ' | sort -u | wc -l`
+    if [ "$ML01" -ne "$ML1" ]; then
         echo "--------------------------------------------" >> $LOGFILE
         echo "WARNING: Duplicate device entry in mountlist" | tee -a $LOGFILE
         echo "--------------------------------------------" >> $LOGFILE
     fi
-    if [ "$ML0" -ne "$ML2" ]; then
+    if [ "$ML02" -ne "$ML2" ]; then
         echo "--------------------------------------------" >> $LOGFILE
         echo "WARNING: Duplicate mountpoint entry in mountlist" | tee -a $LOGFILE