Ignore:
Timestamp:
Mar 30, 2007, 9:48:35 AM (13 years ago)
Author:
bruno
Message:
  • Fix a bug for FC6 where the boot disk size was again insufficient (Rene.Rabaud_at_free.fr)
  • mindi_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/stable/mindi/mindi

    r1255 r1281  
    8383
    8484EXTRA_SPACE=$mindi_extra_space
    85 IA64_BOOT_SIZE=$mindi_ia64_boot_size
     85BOOT_SIZE=$mindi_boot_size
    8686DEPLIST_DIR="$MINDI_CONF/deplist.d"
    8787DEPLIST_FILE="$MINDI_CONF/$mindi_deplist_file"
     
    15161516    find $imagesdir -type f > $MINDI_TMP/imagesdir.files
    15171517    i=`grep -F "/mindi-root.1" $MINDI_TMP/imagesdir.files 2> /dev/null`
    1518     j=`grep -F "/mindi-boot" $MINDI_TMP/imagesdir.files | grep -Ev '2880|5760'`
     1518    j=`grep -F "/mindi-boot" $MINDI_TMP/imagesdir.files | grep -Ev "2880|$BOOT_SIZE"`
    15191519    if [ "$i" ] ; then
    15201520        CopyImageToDisk $j $data_dev "boot disk"
     
    15861586        mkisofs -U -J -r -o $MINDI_CACHE/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
    15871587    else
    1588         mkisofs -J -r -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$IA64_BOOT_SIZE.img -c isolinux/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     1588        mkisofs -J -r -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
    15891589    fi
    15901590    if [ "$?" -ne "0" ] ; then
     
    19201920    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?"
    19211921    if [ "$ARCH" != "ia64" ] ; then
    1922         [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     1922        [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
    19231923    fi
    19241924    echo -en "..."
     
    20892089    echo -en "Making "$disksize"KB boot disk..."
    20902090    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?"
    2091     [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     2091    [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
    20922092    echo -en "..."
    20932093    imagefile=$imagesdir/mindi-bootroot.$disksize.img
     
    32813281if [ "$USE_LILO" = "yes" ] ; then
    32823282    if [ "$ARCH" = "ia64" ] ; then
    3283         PrepareBootDiskImage_LILO $MINDI_CACHE $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
     3283        PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
    32843284    else
    32853285        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 2880 $kernelpath $ramdisk_size ;  then
    32863286            LogIt "WARNING - failed to create 2.88MB floppy disk image."
    32873287            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    3288             PrepareBootDiskImage_LILO $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
     3288            PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
    32893289        fi
    32903290    fi
     
    32933293        LogIt "WARNING - failed to create 2.88MB floppy disk image."
    32943294        LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    3295         PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     3295        PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
    32963296    fi
    32973297fi
Note: See TracChangeset for help on using the changeset viewer.