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

Timestamp:

Feb 2, 2010, 10:40:28 AM (14 years ago)

Author:

Bruno Cornec

Message:

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

• Improve device exclusion for LVM by adding support for symlinks and mapper systematically at all levels (PV, VG, LV). Shoul

d really provvide the best support possible for LVM exclusion.

• Now supports also exclusion of LVs directly
• Improve mindi by handling excluded devices earlier in the loop.
• Fix LV exclusion when VGs are excluded (the excludedvgs file has to be removed at start and end of analyze-my-lvm not in fu

nctions, as they are called multiple times)

• Rename some variables exported to avoid accidental conflict (EXCLUDE_DEVS => MINDI_EXCLUDE_DEVS and ADDITIONAL_BOOT_PARAMS

=> MINDI_ADDITIONAL_BOOT_PARAMS)

• setfattr also needs the -h flag to restore attributes on symlinks, not on the target file (which may not exist BTW). Should solve #388.
• Using forcemods="mod1 mod2" will now do something and load those modules first
• Update web page on distributions to download
• Add support for ums_cypress module in mindi
• Fix acl backup which was completely wrong.
• Fix a bug where LV were not created anymore if no exclusion !!
• In analyze-my-lvm only use pv.tmp2 when it exists to avoid error msgs

-Adds support for links to modules (.ko pointing to .o) such as with VMWare extensions

• Adds i-want-my-lvm content in mindi log file
• Adds vmxnet3 driver support to mindi for some VMWare versions
• Fix a typo in the way device mapper files where excluded
• use option -h of getfattr to *not* follow symlinks, which breaks RHEL 5.4 as reported in #388. However, getfacl doesn't provide such an option.
• Adds some logs for filelist creation
• Remove option -P from getfattr which may also skip symlinks - Attempt to solve #388
• Exclude rpc_pipefs type of filesystems from find
• Suppress unused mode_of_file function

File:

• branches/2.2.10/mindi/analyze-my-lvm (modified) (8 diffs)

branches/2.2.10/mindi/analyze-my-lvm

@@ -51 +51 @@
         fi
     fi
+
+    # Exclude LVs member of that env var
+    if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+        list_of_devices="`mindi --readalllink $LV_full_string`"
+        l=""
+        for d in $list_of_devices; do
+            l="$l `GiveMapperOfdm $d`"
+        done
+        list_of_devices="`echo $l | sort -u`"
+        for ed in $MINDI_EXCLUDE_DEVS ; do
+            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"
-        fi
-    fi
-    rm -f $MINDI_TMP/excludedvgs
+        if [ "`grep $volume_group $MINDI_TMP/excludedvgs`" != "" ]; then
+            echo "Not including LV $logical_volume as VG $volume_group was excluded"
+            return
+        fi
+    fi
+
+    echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
 }
 
@@ -130 +148 @@
     l=""
     if [ -f /etc/multipath.conf ]; then
-        # If multipath check which type of devidec are given, mpath prefered
+        # If multipath check which type of devide are given, mpath prefered
         for d in $list_of_devices; do
+            l="$l `mindi --readalllink $d`"
             l="$l `GiveMapperOfdm $d`"
         done
-        list_of_devices=$l
-    fi
-
-    rm -f $MINDI_TMP/excludedvgs
-    if [ "$EXCLUDE_DEVS" ] ; then
-        for ed in $EXCLUDE_DEVS ; do
+        list_of_devices="`echo $l | sort -u`"
+    fi
+
+    if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+        for ed in $MINDI_EXCLUDE_DEVS ; do
             if  [ "`echo " $list_of_devices" | grep " $ed"`" != "" ]; then
                 echo $current_VG >> $MINDI_TMP/excludedvgs
@@ -160 +178 @@
 
     rm -f $MINDI_TMP/pv.tmp2
+    l=""
     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
+        l="$l `mindi --readalllink $d`"
+        l="$l `GiveMapperOfdm $d`"
+        list_of_devices="`echo $l | sort -u`"
+        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+            for ed in $MINDI_EXCLUDE_DEVS ; do
+                if  [ "`echo " $list_of_devices " | grep " $ed"`" != "" ]; then
                     skip=1
                     continue
@@ -178 +200 @@
 
     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 " $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.tmp2
+        # If multipath check which type of devide are given, mpath prefered
+        if [ -f  $MINDI_TMP/pv.tmp2 ]; then
+            l=""
+            for d in `cat $MINDI_TMP/pv.tmp2`; do
+                skip=0
+                l="$l `mindi --readalllink $d`"
+                l="$l `GiveMapperOfdm $d`"
+                list_of_devices="`echo $l | sort -u`"
+                if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+                    for ed in $MINDI_EXCLUDE_DEVS ; do
+                        if  [ "`echo " $list_of_devices " | grep " $ed"`" != "" ]; then
+                            skip=1
+                            continue
+                        fi
+                    done
+                fi
+                if [ $skip -eq 1 ]; then
+                    continue
+                fi
+                GiveMapperOfdm $d
+            done
+        fi
+    else
+        if [ -f  $MINDI_TMP/pv.tmp2 ]; then
+            cat $MINDI_TMP/pv.tmp2
+        fi
     fi
     rm -f $MINDI_TMP/pv.tmp $MINDI_TMP/pv.tmp2
@@ -233 +263 @@
         fi
         skip=0
-        if [ "$EXCLUDE_DEVS" ] ; then
-            for ed in $EXCLUDE_DEVS ; do
+        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+            for ed in $MINDI_EXCLUDE_DEVS ; do
                 if  [ "`echo " $rep " | grep " $ed"`" != "" ]; then
                     skip=1
@@ -298 +328 @@
 fi
 
+if [ _"$MINDI_TMP" = _"" ]; then
+    # Launched stdalone, so create a temp dir
+    MINDI_TMP=`mktemp -d $TMPDIR/mindi.XXXXXXXXXX`
+    if [ $? -ne 0 ]; then
+        df $TMPDIR
+        Die "Unable to create a temporary directory ! Check space on $TMPDIR"
+    fi
+    if [ _"$MINDI_TMP" = _"" ]; then
+        Die "MINDI_TMP is empty, aborting"
+    fi
+    if [ _"$MINDI_TMP" = _"/" ]; then
+        Die "MINDI_TMP is /, aborting"
+    fi
+fi
+
 # Older lvmdiskscan use --help, newer --version
 lvmopt="--help"
@@ -328 +373 @@
 fi
 
+rm -f $MINDI_TMP/excludedvgs
 all_lvm_drives_and_partitions=`ListLvmDrivesAndPartitions`
 echo "Just before you extrapolate mountlist to include RAID partitions,"
@@ -365 +411 @@
     echo "(mkfs -t foo $i or something like that)"
 done
+rm -f $MINDI_TMP/excludedvgs
 WriteShutdownScript
 exit 0