Changeset 2565 in MondoRescue

Timestamp:

Feb 1, 2010, 2:37:55 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix LV exclusion when VGs are excluded (the excludedvgs file has to be removed at start and end of analyze-my-lvm not in functions, as they are called multiple times)

File:

• branches/2.2.9/mindi/analyze-my-lvm (modified) (5 diffs)

branches/2.2.9/mindi/analyze-my-lvm

@@ -55 +55 @@
         if [ "`grep $volume_group $MINDI_TMP/excludedvgs`" = "" ]; then
             echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
+        else
+            echo "Not including LV $logical_volume as VG $volume_group was excluded"
         fi
     else
         echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
     fi
-    rm -f $MINDI_TMP/excludedvgs
 }
 
@@ -139 +140 @@
     fi
 
-    rm -f $MINDI_TMP/excludedvgs
     if [ "$MINDI_EXCLUDE_DEVS" ] ; then
         for ed in $MINDI_EXCLUDE_DEVS ; do
@@ -304 +304 @@
 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"
@@ -334 +349 @@
 fi
 
+rm -f $MINDI_TMP/excludedvgs
 all_lvm_drives_and_partitions=`ListLvmDrivesAndPartitions`
 echo "Just before you extrapolate mountlist to include RAID partitions,"
@@ -371 +387 @@
     echo "(mkfs -t foo $i or something like that)"
 done
+rm -f $MINDI_TMP/excludedvgs
 WriteShutdownScript
 exit 0