Changeset 10 in MondoRescue for trunk/mindi/mindi

Timestamp:

Sep 6, 2005, 6:05:26 PM (19 years ago)

Author:

bcornec

Message:

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

File:

• trunk/mindi/mindi (modified) (4 diffs)

trunk/mindi/mindi

@@ -1872 +1872 @@
     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?"
     if [ "$ARCH" != "ia64" ] ; then
-        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && Die "PDBI - disksize is $disksize - bad size"
+        [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     fi
     echo -en "..."
@@ -2026 +2026 @@
     echo -en "Making "$disksize"KB boot disk..."
     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?"
-    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && Die "PDBI - disksize is $disksize - bad size"
+    [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
@@ -2790 +2790 @@
     fi
     floppy_modules=""
-    if [ "$disksize" -eq "2880" ] ; then
+    if [ "$disksize" -lt "2880" ] ; then
+    list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+    else
     list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
-    else
-    list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     fi
     if [ -e "$MONDO_TMP/start-nfs" ] ; then
@@ -3238 +3238 @@
     LogIt "if you want to make a 1.72MB floppy floppy disk."
     fi
-    PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
+    if !PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size ; then
+        LogIt "Warning! Failed to create 2.88MB floppy disk image."
+        LogIt "Please reduce your kernel's size"
+        LogIt "if you want to make a 2.88MB floppy floppy disk."
+    fi
+    PrepareBootDiskImage_SYSLINUX $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
 fi