Changeset 2546 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Jan 21, 2010, 8:50:00 PM (14 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2523:2545 /mondorescue/branches/2.2.9

• Adds the --rescue flag to ntfsclone (Andree Leidenfrost andree_at_debian.org)
• Fix 2 typos in the HOWTO (reported by Bram Mertens bram-mertens_at_linux.be)
• Patch from Rogério Brito rbrito_at_ime.usp.br which fixes errors in man pages format
• Fix syntax issue in analyze-my-lvm
• Better doc for pre and post
• Finally the function ListLvmDrivesAndPartitions is used, as it creates info parsed by mindi !! So reverting back to filter excluded devices in it
• Better exclusion of the LVs from the mountlist at restore time if excludedevs used
• Exclude LVs whose VGs are excluded now in analyze-my-lvm
• First attempt to support device exclusion at restore time through a new boot param excludedevs
• Fix a bug preventing execution of the pre script in init
• LVM exclusion 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
• 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
• Fix the way the dsf is declared in the linked list to have it work
• Fix #383 by using pvdisplay instead of relying on 8e as partition type
• Try to fix #384 by always excluding the dfs per users wish
• Also use the exclude dev feature in case of multipath and exclude resulting /dev/mapper/mpath type of files
• Fix #381 by postfixing spaces at the end of the strings to be cheked in strstr

File:

• branches/2.2.10/mindi/mindi (modified) (3 diffs)

branches/2.2.10/mindi/mindi

@@ -959 +959 @@
             LVM="false"
         fi
+        # Excluded LVs and GVs are not reported here
         all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
-#    echo "all partitions = $all_partitions" > /dev/stderr
     for i in $IMAGE_DEVS ; do
         mount | grep -F "$i " > /dev/null 2> /dev/null && Die "Sorry, $i is already mounted! CANNOT DO IMAGEDEV on it if it's mounted."
@@ -1234 +1234 @@
             fi
         fi
-        if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep -F " $current_partition "`" ] || [ "`echo " $EXCLUDE_DEVS " | grep " $current_partition "`" ] ; then
-            LogFile "Excluding $current_partition from mountlist" 
-            continue
+        skip=0
+        if [ "$EXCLUDE_DEVS" ] ; then
+            for d in $EXCLUDE_DEVS ; do
+                if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
+                    LogFile "Excluding $current_partition from mountlist (due to excluded device $d)"
+                    skip=1
+                    continue
+                fi
+            done
+        fi
+        if [ $skip -eq 1 ]; then
+            continue
         fi
         if [ ! "$partition_mountpt" ] ; then
@@ -1292 +1301 @@
     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
         LogFile "--------------------------------------------"
         echo "WARNING: Duplicate device entry in mountlist" | tee -a $LOGFILE
         LogFile "--------------------------------------------"
     fi
-    if [ "$ML0" -ne "$ML2" ]; then
+    if [ "$ML02" -ne "$ML2" ]; then
         LogFile "--------------------------------------------"
         echo "WARNING: Duplicate mountpoint entry in mountlist" | tee -a $LOGFILE