Changeset 1121 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

Feb 9, 2007, 6:49:33 PM (17 years ago)

Author:

Bruno Cornec

Message:

• 1722 Floppies are NOT supported anymore (allows for mindi to become noarch)
• mindi is now a noarch type of package
• RPM Packaging improvements for Fedora

File:

• branches/stable/mindi/mindi (modified) (6 diffs)

branches/stable/mindi/mindi

@@ -1834 +1834 @@
     if [ "$disksize" -eq "2880" ] ; then
         echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
-    elif [ "$disksize" -eq "1722" ] ; then
-        echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
     elif [ "$disksize" -gt "2880" ] ; then
         /bin/true
@@ -1913 +1911 @@
     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" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     fi
     echo -en "..."
@@ -2082 +2080 @@
     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" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     echo -en "..."
     imagefile=$imagesdir/mindi-bootroot.$disksize.img
     mountpoint=$MINDI_TMP/mountpoint.$$
     mkdir -p $mountpoint
-# If I format a 1722KB data file & run syslinux on it, the resultant image
-# won't boot. So, I have formatted a floppy, called syslinux on/to it, and
-# used 'dd' to copy it to sys-disk.raw (zipped to sys-disk.raw.gz).
-# If I extract it, mount it, copy my files to it, etc. then the resultant
-# image _is_ bootable. I don't know why syslinux and/or mkfs.vfat won't
-# play nicely and I don't care. :) I have worked around the problem. -Hugo, 06/27/2002
-    if [ "$disksize" = "1722" ] ; then
-        gzip -dc $MINDI_LIB/sys-disk.raw.gz > $imagefile || Die "Cannot dd blank file"
-    else
-        dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
-        echo "Creating vfat filesystem on $imagefile" >> $LOGFILE
-        mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
-        syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
-    fi
+    dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
+    echo "Creating vfat filesystem on $imagefile" >> $LOGFILE
+    mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
+    syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
+
     mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
 
@@ -3279 +3268 @@
         PrepareBootDiskImage_LILO $MINDI_CACHE $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
     else
-        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 1722 $kernelpath $ramdisk_size ; then
-            LogIt "WARNING - failed to create 1.72MB boot image."
-            LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
-        fi
         if ! PrepareBootDiskImage_LILO $MINDI_CACHE 2880 $kernelpath $ramdisk_size ;  then
             LogIt "WARNING - failed to create 2.88MB floppy disk image."
@@ -3290 +3275 @@
     fi
 else
-    if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 1722 $kernelpath $ramdisk_size ; then
-        LogIt "WARNING - failed to create 1.72MB boot image."
-        LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
-        if ! PrepareBootDiskImage_SYSLINUX $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_SYSLINUX $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
-        fi
+    if ! PrepareBootDiskImage_SYSLINUX $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_SYSLINUX $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
     fi
 fi
@@ -3306 +3287 @@
 if [ _"$MONDO_SHARE" = _"" ]; then
     ListImagesForUser $MINDI_CACHE
-    boot_dev=/dev/fd0u1722
-    [ ! -e "$boot_dev" ] && mknod $boot_dev b 2 60
-    [ ! -e "$boot_dev" ] && boot_dev=/dev/fd0H1722
-    [ ! -e "$boot_dev" ] && Die "Will you PLEASE tell your distribution maker to create the 1.72MB devices in /dev?"
     if [ "$PROMPT_WRITE_BOOT_FLOPPIES" = "yes" ]; then
         OfferToCopyImagesToDisks $MINDI_CACHE $boot_dev $FDDEVICE