Ignore:
Timestamp:
Jun 2, 2008, 10:49:01 AM (12 years ago)
Author:
Bruno Cornec
Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1939 r1977  
    13851385    rm -Rf $MINDI_TMP/iso
    13861386    mkdir -p $MINDI_TMP/iso/{images,archives,isolinux}
    1387     cp -f $1/*.img $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $i to $MINDI_TMP/iso/images"
     1387    cp -f $1/*.gz $MINDI_TMP/iso/images 2>> $LOGFILE || LogIt "OfferToMakeBootableISO: Cannot copy $1/*.gz to $MINDI_TMP/iso/images"
    13881388    old_pwd=`pwd`
    13891389    cd $MINDI_TMP/iso
     
    14271427    else
    14281428        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     1429        rm -f images/mindi-bootroot.$BOOT_SIZE.img
    14291430    fi
    14301431    if [ "$?" -ne "0" ] ; then
     
    16301631            else
    16311632                options="interactive expert compare iso nuke isonuke"
    1632 # hda hdb hdc hdd"
    16331633            fi
    16341634        else
     
    21002100    rm -f $orig_file
    21012101    return 0
    2102 }
    2103 
    2104 
    2105 ScanCDandTape() {
    2106     local i
    2107 
    2108     for i in /dev/st0 /dev/ht0 /dev/cdrom /dev/cdrom0 /dev/cdrom 1 ; do
    2109         dd if=$i of=/dev/null bs=64k count=1 &> /dev/null
    2110     done
    21112102}
    21122103
     
    28802871    fi
    28812872fi
    2882 #ScanCDandTape
    28832873[ "$CDRECOVERY" = "yes" ] || CDRECOVERY=no
    28842874if [ "$CDRECOVERY" = "yes" ] ; then
     
    29562946fi
    29572947if [ _"$MONDO_SHARE" = _"" ] && [ "$INTERACTIVE" = "yes" ] && [ "$ARCH" != "ia64" ] ; then
    2958     echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot image (y/[n]) ?"
    2959     read ch
    2960     if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
    2961         USE_LILO=no
    2962     else
    2963         USE_LILO=yes
    2964     fi
     2948    USE_LILO=no
    29652949fi
    29662950if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
Note: See TracChangeset for help on using the changeset viewer.