Changeset 236 for trunk/mindi/mindi


Ignore:
Timestamp:
Dec 19, 2005, 7:31:56 PM (14 years ago)
Author:
bcornec
Message:

merge -r229:235 $SVN_M/branches/2.05

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r226 r236  
    222222    mappath=$1
    223223    KBDEPTH=$(($KBDEPTH+1))
    224     [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 1170, approx.)"
     224    [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 2160, approx.)"
    225225    if [ -e "$bigdir/$mappath" ] ; then
    226226    echo "$mappath already added" >> $LOGFILE
     
    422422    while [ "$diskno" -le "$noof_disks" ] ; do
    423423    echo -en "#$diskno..."
    424     cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 250] Cannot copy $tardir/$diskno.tar.gz to $outdir"
     424    cp -f $tardir/$diskno.tar.gz $outdir || LogIt "[line 424] Cannot copy $tardir/$diskno.tar.gz to $outdir"
    425425        CreateOneDataDiskImage $tardir/$diskno.tar.gz $outdir/mindi-data-$diskno.img $diskno $noof_disks
    426426        diskno=$(($diskno+1))
     
    16721672    if [ "`DidMondoCallMe`" ] ; then
    16731673        if [ "$CDRECOVERY" != "yes" ] ; then
    1674                 if [ -e "$MONDO_TMP/start-nfs" ] ; then
    1675                     echo -en "Press <enter> to continue.\n"
    1676         elif [ ! "$MONDO_TMP" ] ; then
    1677             echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
    1678                 else
    1679                     echo -en "$BOOT_MEDIA_MESSAGE"
    1680                 fi
     1674            if [ -e "$MONDO_TMP/start-nfs" ] ; then
     1675                echo -en "Press <enter> to continue.\n"
     1676            elif [ ! "$MONDO_TMP" ] ; then
     1677                echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
     1678            else
     1679                echo -en "$BOOT_MEDIA_MESSAGE"
     1680            fi
    16811681        fi
    16821682    fi
     
    32583258if [ "$imagesdir" != "/root/images/mindi" ] ; then
    32593259    for i in `find $imagesdir -maxdepth 1 -name "*.iso" -o -name "*.img"` ; do
    3260     cp -f $i /root/images/mindi || LogIt "[line 1613] Cannot copy $i to /root/images/mindi"
     3260    cp -f $i /root/images/mindi || LogIt "[line 3260] Cannot copy $i to /root/images/mindi"
    32613261    done
    32623262fi
Note: See TracChangeset for help on using the changeset viewer.