Changeset 2784 in MondoRescue

Timestamp:

Apr 29, 2011, 3:36:40 PM (13 years ago)

Author:

Bruno Cornec

Message:

r2154@localhost (orig r2153): bruno | 2009-02-17 19:58:26 +0100
Even better protection for bad MINDI_TMP or bad MONDO_TMP

File:

• branches/2.2.8/mindi/mindi (modified) (5 diffs)

branches/2.2.8/mindi/mindi

@@ -98 +98 @@
     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
 export MINDI_TMP
 
@@ -238 +244 @@
     # Clean temporary files only when standalone mindi
     if [ _"$MINDI_TMP" != _"$MONDO_TMP" ]; then
-        # If no space on /tmp we may have an empty var
-        if [ _"$MINDI_TMP" != _"" ]; then
-            # Paranoid mode
-            if [ _"$MINDI_TMP" != _"/" ]; then
-                rm -Rf $MINDI_TMP
-            fi
-        fi
+        rm -Rf $MINDI_TMP
     fi
     exit $1
@@ -1296 +1296 @@
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
     fi
-    if [ _"$MINDI_TMP" = _"" ]; then
-        Die "MINDI_TMP undefined"
-    fi
     rm -Rf $MINDI_TMP/iso
     mkdir -p $MINDI_TMP/iso/{images,archives}
@@ -1367 +1364 @@
         read i
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
-    fi
-    if [ _"$MINDI_TMP" = _"" ]; then
-        Die "MINDI_TMP undefined"
     fi
     rm -Rf $MINDI_TMP/usb
@@ -2652 +2646 @@
         # Change MINDI_TMP for the one provided by mondo 
         # So that it can get back the built files
+        if [ _"$MONDO_TMP" = _"" ]; then
+            Die "MONDO_TMP is empty, aborting"
+        fi
+        if [ _"$MONDO_TMP" = _"/" ]; then
+            Die "MONDO_TMP is /, aborting"
+        fi
         mv $MINDI_TMP/* $MINDI_TMP/.??* $MONDO_TMP 2>> $LOGFILE
         rmdir $MINDI_TMP