Changeset 1282


Ignore:
Timestamp:
Mar 30, 2007, 4:58:46 PM (12 years ago)
Author:
bruno
Message:
  • Fix a bug for FC6 where the boot disk size was again insufficient (Rene.Rabaud_at_free.fr)
  • BOOT_SIZE is now the parameter used globally to declare the size of the boot "floppy" put on the CD (as well as for ia64)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.2/mindi/mindi

    r1258 r1282  
    4141
    4242EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
    43 IA64_BOOT_SIZE=8192       ; # size of the ia64 boot disk
     43BOOT_SIZE=8192       ;      # size of the boot disk
    4444WRITE_BOOT_FLOPPIES="yes" ; # do you want to be propted to write floppy images
    4545PROMPT_WRITE_BOOT_FLOPPIES="yes"
     
    15701570    [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
    15711571    i=`find $imagesdir -type f | grep -F "/mindi-root.1" 2> /dev/null`
    1572     j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev '2880|5760'`
     1572    j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev "2880|$BOOT_SIZE"`
    15731573    if [ "$i" ] ; then
    15741574        CopyImageToDisk $j $data_dev "boot disk"
     
    16361636        mkisofs -U -J -r -o $CACHE_LOC/mindi.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
    16371637    else
    1638         mkisofs -J -r -o $CACHE_LOC/mindi.iso -b images/mindi-bootroot.$IA64_BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     1638        mkisofs -J -r -o $CACHE_LOC/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
    16391639    fi
    16401640    if [ "$?" -ne "0" ] ; then
     
    18281828    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    18291829    if [ "$ARCH" != "ia64" ] ; then
    1830         [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     1830        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
    18311831    fi
    18321832    echo -en "..."
     
    19961996    echo -en "Making "$disksize"KB boot disk..."
    19971997    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    1998     [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     1998    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
    19991999    echo -en "..."
    20002000    imagefile=$imagesdir/mindi-bootroot.$disksize.img
     
    31163116if [ "$USE_LILO" = "yes" ] ; then
    31173117    if [ "$ARCH" = "ia64" ] ; then
    3118         PrepareBootDiskImage_LILO $CACHE_LOC $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
     3118        PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
    31193119    else
    31203120        if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
     
    31253125            LogIt "WARNING - failed to create 2.88MB floppy disk image."
    31263126            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    3127             PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
     3127            PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
    31283128        fi
    31293129    fi
     
    31353135            LogIt "WARNING - failed to create 2.88MB floppy disk image."
    31363136            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    3137             PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     3137            PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
    31383138        fi
    31393139    fi
Note: See TracChangeset for help on using the changeset viewer.