Changeset 292 for trunk/mindi


Ignore:
Timestamp:
Jan 10, 2006, 9:51:24 AM (14 years ago)
Author:
bcornec
Message:

svn merge -r288:291 $SVN_M/branches/2.06

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r286 r292  
    15411541    [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
    15421542    i=`find $imagesdir -type f | fgrep "/mindi-root.1" 2> /dev/null`
    1543     j=`find $imagesdir -type f | fgrep "/mindi-boot" | fgrep -v 2880`
     1543    j=`find $imagesdir -type f | fgrep "/mindi-boot" | egrep -v '2880|5760'`
    15441544#    echo "i=$i"
    15451545#    echo "j=$j"
     
    17551755    options=""
    17561756        if [ "$ARCH" != "ia64" ] ; then
    1757         echo -en "boot=/dev/loop0\ndisk=/dev/loop0\n"
     1757            echo -en "boot=/dev/loop0\ndisk=/dev/loop0\n"
    17581758        fi
    17591759        if [ "$disksize" -eq "2880" ] ; then
    1760         echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
     1760            echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
    17611761        elif [ "$disksize" -eq "1722" ] ; then
    1762         echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
     1762            echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
    17631763        elif [ "$disksize" -gt "2880" ] ; then
    17641764            /bin/true
    17651765        else
    1766         echo -en "bios=0x00\nsectors=18\nheads=2\ncylinders=80\n"
     1766            echo -en "bios=0x00\nsectors=18\nheads=2\ncylinders=80\n"
    17671767        fi
    17681768        if [ "$ARCH" != "ia64" ] ; then
     
    17721772        echo -en "default=RESTORE\n"
    17731773    elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
    1774     if [ -e "$MONDO_TMP/start-nfs" ] ; then
    1775         echo -en "default=iso\n"
    1776     else
    1777         echo -en "default=interactive\n"
    1778     fi
    1779     else
    1780     echo -en "default=expert\n"
    1781     fi
    1782         echo -en "prompt\n"
     1774        if [ -e "$MONDO_TMP/start-nfs" ] ; then
     1775            echo -en "default=iso\n"
     1776        else
     1777            echo -en "default=interactive\n"
     1778        fi
     1779    else
     1780        echo -en "default=expert\n"
     1781    fi
     1782
     1783    echo -en "prompt\n"
    17831784    if [ "$ARCH" != "ia64" ] ; then
    17841785        echo -en "vga=normal\nbackup=/dev/null\nmessage=/message\n"
     
    18021803    fi
    18031804    else
    1804     options="expert"
     1805        options="expert"
    18051806    fi
    18061807    for i in $options ; do
    18071808    ooo=$i
    18081809    [ "$ooo" = "RESTORE" ] && ooo="nuke"
    1809         if [ "$ARCH" = "ia64" ] ; then
     1810    if [ "$ARCH" = "ia64" ] ; then
    18101811        rootpart="root=/dev/ram0\n\t"
    18111812    else
     
    20172018    cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
    20182019    if [ -e "$MONDO_TMP/start-nfs" ] ; then
    2019     mv syslinux.cfg syslinux.cfg.orig
    2020     sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
     2020        mv syslinux.cfg syslinux.cfg.orig
     2021        sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
    20212022    fi
    20222023    cd $old_pwd
     
    20242025    cp -f $TMP_ROOT/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
    20252026    if [ "$?" -ne "0" ] ; then
    2026     LogIt "Failed to copy $TMP_ROOT/mindi.rdz to $mountpoint\n"
    2027     cat $TMP_ROOT/mtpt.$$ >> $LOGFILE
    2028     LogIt "Please unload some of your modules and try again.\n"
    2029     rm -f $TMP_ROOT/mtpt.$$
    2030     LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
     2027        LogIt "Failed to copy $TMP_ROOT/mindi.rdz to $mountpoint\n"
     2028        cat $TMP_ROOT/mtpt.$$ >> $LOGFILE
     2029        LogIt "Please unload some of your modules and try again.\n"
     2030        rm -f $TMP_ROOT/mtpt.$$
     2031        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
    20312032        retval=$(($retval+1))
    20322033    fi
     
    20412042    cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
    20422043    if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
    2043     echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
    2044     du -sk $mountpoint/* >> $LOGFILE
    2045     echo "--- end of list of files ---" >> $LOGFILE
    2046     echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
     2044        echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
     2045        du -sk $mountpoint/* >> $LOGFILE
     2046        echo "--- end of list of files ---" >> $LOGFILE
     2047        echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
    20472048Sorry, your kernel is too big for a boot/root floppy.\nI'll try the new boot/root two-disk thingy.\n" >> $LOGFILE
    20482049        rm -f $mountpoint/vmlinuz
    2049     cd $old_pwd
     2050        cd $old_pwd
    20502051        umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
    20512052        rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
     
    27482749    floppy_modules=""
    27492750    if [ "$disksize" -lt "2880" ] ; then
    2750     list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    2751     else
    2752     list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     2751        list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     2752    else
     2753        list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    27532754    fi
    27542755    if [ -e "$MONDO_TMP/start-nfs" ] ; then
     
    31923193else
    31933194    if ! PrepareBootDiskImage_SYSLINUX $imagesdir 1722 $kernelpath $ramdisk_size ; then
    3194     LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
    3195     LogIt "if you want to make a 1.72MB floppy disk.\n"
    3196     fi
    3197     if ! PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size ; then
    3198         LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
    3199         LogIt "Please reduce your kernel's size\n"
    3200         LogIt "if you want to make a 2.88MB floppy disk.\n"
    3201     fi
    3202     PrepareBootDiskImage_SYSLINUX $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     3195        LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
     3196        LogIt "if you want to make a 1.72MB floppy disk.\n"
     3197        if ! PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size ; then
     3198            LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
     3199            LogIt "Please reduce your kernel's size\n"
     3200            LogIt "if you want to make a 2.88MB floppy disk.\n"
     3201            PrepareBootDiskImage_SYSLINUX $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     3202        fi
     3203    fi
    32033204fi
    32043205
Note: See TracChangeset for help on using the changeset viewer.