Changeset 10 for trunk


Ignore:
Timestamp:
Sep 6, 2005, 6:05:26 PM (14 years ago)
Author:
bcornec
Message:

Try to fix bug reported at http://qa.mandriva.com/show_bug.cgi?id=16862

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r1 r10  
    18721872    TurnTgzIntoRdz $MINDI_HOME/rootfs $TMP_ROOT/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    18731873    if [ "$ARCH" != "ia64" ] ; then
    1874         [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && Die "PDBI - disksize is $disksize - bad size"
     1874        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
    18751875    fi
    18761876    echo -en "..."
     
    20262026    echo -en "Making "$disksize"KB boot disk..."
    20272027    TurnTgzIntoRdz $MINDI_HOME/rootfs $TMP_ROOT/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    2028     [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && Die "PDBI - disksize is $disksize - bad size"
     2028    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
    20292029    echo -en "..."
    20302030    imagefile=$imagesdir/mindi-bootroot.$disksize.img
     
    27902790    fi
    27912791    floppy_modules=""
    2792     if [ "$disksize" -eq "2880" ] ; then
     2792    if [ "$disksize" -lt "2880" ] ; then
     2793    list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     2794    else
    27932795    list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    2794     else
    2795     list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    27962796    fi
    27972797    if [ -e "$MONDO_TMP/start-nfs" ] ; then
     
    32383238    LogIt "if you want to make a 1.72MB floppy floppy disk."
    32393239    fi
    3240     PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
     3240    if !PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size ; then
     3241        LogIt "Warning! Failed to create 2.88MB floppy disk image."
     3242        LogIt "Please reduce your kernel's size"
     3243        LogIt "if you want to make a 2.88MB floppy floppy disk."
     3244    fi
     3245    PrepareBootDiskImage_SYSLINUX $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
    32413246fi
    32423247
Note: See TracChangeset for help on using the changeset viewer.