Changeset 1282 in MondoRescue

Timestamp:

Mar 30, 2007, 4:58:46 PM (18 years ago)

Author:

Bruno Cornec

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:

• branches/2.2.2/mindi/mindi (modified) (8 diffs)

branches/2.2.2/mindi/mindi

@@ -41 +41 @@
 
 EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
-IA64_BOOT_SIZE=8192       ; # size of the ia64 boot disk
+BOOT_SIZE=8192       ;      # size of the boot disk
 WRITE_BOOT_FLOPPIES="yes" ; # do you want to be propted to write floppy images
 PROMPT_WRITE_BOOT_FLOPPIES="yes"
@@ -1570 +1570 @@
     [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
     i=`find $imagesdir -type f | grep -F "/mindi-root.1" 2> /dev/null`
-    j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev '2880|5760'`
+    j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev "2880|$BOOT_SIZE"`
     if [ "$i" ] ; then
         CopyImageToDisk $j $data_dev "boot disk"
@@ -1636 +1636 @@
         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
     else
-        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
+        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
     fi
     if [ "$?" -ne "0" ] ; then
@@ -1828 +1828 @@
     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?"
     if [ "$ARCH" != "ia64" ] ; then
-        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
+        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
     fi
     echo -en "..."
@@ -1996 +1996 @@
     echo -en "Making "$disksize"KB boot disk..."
     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?"
-    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
+    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
@@ -3116 +3116 @@
 if [ "$USE_LILO" = "yes" ] ; then
     if [ "$ARCH" = "ia64" ] ; then
-        PrepareBootDiskImage_LILO $CACHE_LOC $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
+        PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
     else
         if ! PrepareBootDiskImage_LILO $CACHE_LOC 1722 $kernelpath $ramdisk_size ; then
@@ -3125 +3125 @@
             LogIt "WARNING - failed to create 2.88MB floppy disk image."
             LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-            PrepareBootDiskImage_LILO $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
+            PrepareBootDiskImage_LILO $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
         fi
     fi
@@ -3135 +3135 @@
             LogIt "WARNING - failed to create 2.88MB floppy disk image."
             LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-            PrepareBootDiskImage_SYSLINUX $CACHE_LOC 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+            PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
         fi
     fi