Changeset 939 in MondoRescue for trunk/mindi/mindi

Timestamp:

Nov 17, 2006, 1:41:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r931:938 $SVN_M/branches/stable

File:

• trunk/mindi/mindi (modified) (4 diffs)

trunk/mindi/mindi

@@ -33 +33 @@
 MINDI_CONF=YYY
 MINDI_SBIN=${MINDI_PREFIX}/sbin
-
-if [ "$ARCH" = "x86_64" ] ; then
-    MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
-else
-    MINDI_LIB=${MINDI_PREFIX}/lib/mindi
-fi
+MINDI_LIB=LLL
 
 MINDI_CONFIG_DIST="$MINDI_CONF/mindi.conf.dist"
@@ -525 +520 @@
         ln -sf $vanilla_lib_name $outdir$optimized_lib_name
         echo "Excluding $optimized_lib_name" >> $LOGFILE
-        grep -Fvx "$optimized_lib_name $filelist" > $filelist.tmp
+        grep -Fvx "$optimized_lib_name" "$filelist" > $filelist.tmp
         echo "Replacing it with $vanilla_lib_name" >> $LOGFILE
         echo "$vanilla_lib_name" >> $filelist.tmp
@@ -2787 +2782 @@
     elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
         MONDOTMP=$2
-        BIDON=$3
+        CACHE_LOC=$3
+        if [ _"$CACHE_LOC" != _"" ]; then
+            mkdir -p $CACHE_LOC
+        fi
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
 ###
@@ -2846 +2844 @@
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
         MONDO_ROOT=`echo $CACHEDIR | sed 's/\(.*\)\/.*/\1/'`
-        [ "$MONDO_ROOT" = "" ] && Die "MONDO_ROOT is undefined"
+        if [ _"$MONDO_ROOT" != _"" ]; then
+            mkdir -p $MONDO_ROOT
+        else
+            Die "MONDO_ROOT is undefined"
+        fi
     else
         echo "Syntax: mindi (--custom ....)" >> /dev/stderr