Changeset 1281 in MondoRescue

Timestamp:

Mar 30, 2007, 9:48:35 AM (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)
• 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)

Location:

branches/stable/mindi

Files:

• distributions/conf/mindi.conf.dist (modified) (1 diff)
• mindi (modified) (7 diffs)

branches/stable/mindi/distributions/conf/mindi.conf.dist

@@ -15 +15 @@
 
 #
-# Size of the boot image for ia64
+# Size of the boot image
 #
-mindi_ia64_boot_size=8192
+mindi_boot_size=8192
 
 #

branches/stable/mindi/mindi

@@ -83 +83 @@
 
 EXTRA_SPACE=$mindi_extra_space
-IA64_BOOT_SIZE=$mindi_ia64_boot_size
+BOOT_SIZE=$mindi_boot_size
 DEPLIST_DIR="$MINDI_CONF/deplist.d"
 DEPLIST_FILE="$MINDI_CONF/$mindi_deplist_file"
@@ -1516 +1516 @@
     find $imagesdir -type f > $MINDI_TMP/imagesdir.files
     i=`grep -F "/mindi-root.1" $MINDI_TMP/imagesdir.files 2> /dev/null`
-    j=`grep -F "/mindi-boot" $MINDI_TMP/imagesdir.files | grep -Ev '2880|5760'`
+    j=`grep -F "/mindi-boot" $MINDI_TMP/imagesdir.files | grep -Ev "2880|$BOOT_SIZE"`
     if [ "$i" ] ; then
         CopyImageToDisk $j $data_dev "boot disk"
@@ -1586 +1586 @@
         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
     else
-        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
+        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
     fi
     if [ "$?" -ne "0" ] ; then
@@ -1920 +1920 @@
     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" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
+        [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
     fi
     echo -en "..."
@@ -2089 +2089 @@
     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" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
+    [ "$disksize" != "2880" ] && [ "$disksize" != "$BOOT_SIZE" ] && Die "PDBI - disksize is $disksize - bad size"
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
@@ -3281 +3281 @@
 if [ "$USE_LILO" = "yes" ] ; then
     if [ "$ARCH" = "ia64" ] ; then
-        PrepareBootDiskImage_LILO $MINDI_CACHE $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
+        PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
     else
         if ! PrepareBootDiskImage_LILO $MINDI_CACHE 2880 $kernelpath $ramdisk_size ;  then
             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 $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
+            PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
         fi
     fi
@@ -3293 +3293 @@
         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 $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+        PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     fi
 fi