Changeset 2546 in MondoRescue for branches/2.2.10/mindi/analyze-my-lvm

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/analyze-my-lvm (modified) (4 diffs)

branches/2.2.10/mindi/analyze-my-lvm

@@ -51 +51 @@
         fi
     fi
-    echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
+    # 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"
+        fi
+    fi
+    rm -f $MINDI_TMP/excludedvgs
 }
 
@@ -131 +137 @@
     fi
 
+    rm -f $MINDI_TMP/excludedvgs
+    if [ "$EXCLUDE_DEVS" ] ; then
+        for ed in $EXCLUDE_DEVS ; do
+            if  [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then
+                echo $current_VG >> $MINDI_TMP/excludedvgs
+                return
+            fi
+        done
+    fi
     echo "# $LVMCMD vgcreate $current_VG$VG_params $list_of_devices"
     echo "# $LVMCMD vgchange -a y $current_VG"
@@ -143 +158 @@
         pvscan 2> /dev/null | grep '"' | cut -d'"' -f2  >  $MINDI_TMP/pv.tmp
     fi
+
+    rm -f $MINDI_TMP/pv.tmp2
+    for d in `cat $MINDI_TMP/pv.tmp`; do
+        # Skip devices excluded, coming from mondoarchive
+        skip=0
+        if [ "$EXCLUDE_DEVS" ] ; then
+            for ed in $EXCLUDE_DEVS ; do
+                if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
+                    skip=1
+                    continue
+                fi
+            done
+        fi
+        if [ $skip -eq 1 ]; then
+            continue
+        fi
+        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.tmp`; do
+        for d in `cat $MINDI_TMP/pv.tmp2`; do
+            skip=0
+            if [ "$EXCLUDE_DEVS" ] ; then
+                for ed in $EXCLUDE_DEVS ; do
+                    if  [ "`echo " $d " | grep " $ed"`" != "" ]; then
+                        skip=1
+                        continue
+                    fi
+                done
+            fi
+            if [ $skip -eq 1 ]; then
+                continue
+            fi
             GiveMapperOfdm $d
         done
     else
-        cat $MINDI_TMP/pv.tmp
-    fi
-    rm -f $MINDI_TMP/pv.tmp
+        cat $MINDI_TMP/pv.tmp2
+    fi
+    rm -f $MINDI_TMP/pv.tmp $MINDI_TMP/pv.tmp2
 }
 
@@ -177 +223 @@
 
 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 
-        # 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 multipath check which type of devices are given, mpath prefered
         if [ -f /etc/multipath.conf ]; then
-            GiveMapperOfdm $d
+            i=`GiveMapperOfdm $d`
+            rep=$i
         else
-            echo $d
-        fi
+            rep=$d
+        fi
+        skip=0
+        if [ "$EXCLUDE_DEVS" ] ; then
+            for ed in $EXCLUDE_DEVS ; do
+                if  [ "`echo " $rep " | grep " $ed"`" != "" ]; then
+                    skip=1
+                    continue
+                fi
+            done
+        fi
+        if [ $skip -eq 1 ]; then
+            continue
+        fi
+        echo $rep
     done
 }