Changeset 426 in MondoRescue for trunk/mindi/mindi

Timestamp:

Feb 23, 2006, 4:09:24 PM (18 years ago)

Author:

bcornec

Message:

merge -r421:425 $SVN_M/branches/stable

File:

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

trunk/mindi/mindi

@@ -628 +628 @@
     [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
     echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
-    echo "MONDO_LIB = $MONDO_LIB" >> $LOGFILE
+    echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
     mkdir -p $CACHE_LOC
 }
@@ -1613 +1613 @@
         cp -f $TMP_ROOT/iso/isolinux/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT || Die "Cannot copy core files to ramdisk for boot disk. Did you run out of disk space?"
     fi
-    [ "$MONDO_LIB" ] && cp -f $MONDO_LIB/autorun .   
+    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
     if [ -d "/home/MondoCD" ] ; then
     cp -pRdu /home/MondoCD/* .
@@ -2196 +2196 @@
     tar -zxf $MINDI_LIB/x11-tools.tgz 2>> $LOGFILE || LogIt "Warning - error occurred while unzipping x11-tools.tgz\n"
     fi
-    if [ -e "$MONDO_LIB/restore-scripts" ] ; then
-        cp -Rdf $MONDO_LIB/restore-scripts/* . 2>> $LOGFILE
-        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_LIB/restore-scripts"
+    if [ -e "$MONDO_SHARE/restore-scripts" ] ; then
+        cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
+        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
     [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .
@@ -2811 +2811 @@
         [ "$USE_LZO" = "yes" ] && echo -en "Pras 4 Pres 2004" >> $mountpoint/tmp/USING-LZO
         [ "$USE_COMP" = "yes" ] && echo -en "Compression, yep" >> $mountpoint/tmp/USING-COMP
-    [ "$USE_STAR" = "yes" ] && echo =en "Using star. Hooray." >> $mountpoint/tmp/USING-STAR
+        [ "$USE_STAR" = "yes" ] && echo -en "Using star. Hooray." >> $mountpoint/tmp/USING-STAR
     fi
     mkdir -p $mountpoint/tmp