Changeset 236 in MondoRescue for trunk/mindi/mindi

Timestamp:

Dec 19, 2005, 7:31:56 PM (18 years ago)

Author:

bcornec

Message:

merge -r229:235 $SVN_M/branches/2.05

File:

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

trunk/mindi/mindi

@@ -222 +222 @@
     mappath=$1
     KBDEPTH=$(($KBDEPTH+1))
-    [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 1170, approx.)"
+    [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 2160, approx.)"
     if [ -e "$bigdir/$mappath" ] ; then
     echo "$mappath already added" >> $LOGFILE
@@ -422 +422 @@
     while [ "$diskno" -le "$noof_disks" ] ; do
     echo -en "#$diskno..."
-    cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 250] Cannot copy $tardir/$diskno.tar.gz to $outdir"
+    cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir"
         CreateOneDataDiskImage $tardir/$diskno.tar.gz $outdir/mindi-data-$diskno.img $diskno $noof_disks
         diskno=$(($diskno+1))
@@ -1672 +1672 @@
     if [ "`DidMondoCallMe`" ] ; then
         if [ "$CDRECOVERY" != "yes" ] ; then
-                if [ -e "$MONDO_TMP/start-nfs" ] ; then
-                    echo -en "Press <enter> to continue.\n"
-        elif [ ! "$MONDO_TMP" ] ; then
-            echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
-                else
-                    echo -en "$BOOT_MEDIA_MESSAGE"
-                fi
+            if [ -e "$MONDO_TMP/start-nfs" ] ; then
+                echo -en "Press <enter> to continue.\n"
+            elif [ ! "$MONDO_TMP" ] ; then
+                echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
+            else
+                echo -en "$BOOT_MEDIA_MESSAGE"
+            fi
         fi
     fi
@@ -3258 +3258 @@
 if [ "$imagesdir" != "/root/images/mindi" ] ; then
     for i in `find $imagesdir -maxdepth 1 -name "*.iso" -o -name "*.img"` ; do
-    cp -f $i /root/images/mindi || LogIt "[line 1613] Cannot copy $i to /root/images/mindi"
+    cp -f $i /root/images/mindi || LogIt "[line 3260] Cannot copy $i to /root/images/mindi"
     done
 fi