unbreak building CDs

diff --git a/tools/mkboot b/tools/mkboot
index 7c6344ea4b9994c86001850ab68805b9f7b0bb3a..e12f7c336a167c84bb7608b82e6fbf870fa5e736 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -9,10 +9,10 @@ mdec=/usr/mdec        # bootstraps
 
 # Check arguments.
 case "$#:$1" in
-1:bootable | 1:hdboot | [12]:fdboot | [12]:cdfdboot )
-       action=$1 dev=$2
+1:bootable | 1:hdboot | [12]:fdboot | [123]:cdfdboot )
+       action=$1 dev=$2 size=$3
        ;;
-*)     echo "Usage: $0 [bootable | hdboot | cdfdboot | fdboot [device]] | cdfdboot [device]" >&2
+*)     echo "Usage: $0 [bootable | hdboot | fdboot [device]] | cdfdboot [device [size]]" >&2
        exit 1
 esac
 
@@ -169,8 +169,12 @@ cdfdboot)
                ramdisk `expr 1440 \* 1024` 2>/dev/null
                dev=/dev/ram
        fi
+       if [ -z "$size" ]
+       then
+               size=1440
+       fi
        umount $dev 2>/dev/null
-       if mkfs -B 1024 -b 1440 -i 512 $dev || exit 1
+       if mkfs -B 1024 -b $size -i 512 $dev || exit 1
        then :
        else
                echo "mkfs of $dev failed."
@@ -203,7 +207,7 @@ main(){trap 10000 boot; menu; };
 save' || exit
 
        # copy image
-       dd if=$dev of=cdfdimage bs=8192 count=180
+       dd if=$dev of=cdfdimage bs=1024 count=$size
 esac
 sync
 exit 0

diff --git a/tools/release.sh b/tools/release.sh
index bb614cf978806a9f712d972741c196f9ce126c6e..57fb0e73260ced1ac72a11d37a8b0f97ff1cbb57 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -356,8 +356,9 @@ umount $TMPDISK3 || exit
 
 (cd ../boot && make)
 dd if=$TMPDISK3 of=$ROOTIMAGE bs=$BS count=$ROOTBLOCKS
-sh mkboot cdfdboot $TMPDISK3
-cp $IMAGE $CDFILES/bootflop.img
+sh mkboot cdfdboot $TMPDISK3 $ROOTKB
+# image no longer fits on a floppy
+#cp $IMAGE $CDFILES/bootflop.img
 cp release/cd/* $CDFILES || true
 echo "This is Minix version $version_pretty prepared `date`." >$CDFILES/VERSION.TXT
 

diff --git a/tools/release/cd/README.TXT b/tools/release/cd/README.TXT
index 6572e30b5ad217eaea7b20ec1d3e2aa88faa8fef..b69e0b8c7b90ff5885e115942d948f1548d9168b 100644 (file)
--- a/tools/release/cd/README.TXT
+++ b/tools/release/cd/README.TXT
@@ -45,9 +45,6 @@ CD CONTENTS:
 This CD contains:\r
 \r
    - README.TXT      This file\r
-   - BOOTFLOP.IMG    If you cannot boot from CD-ROMs, insert the CD-ROM\r
-                     anyway, then copy this floppy image raw to a floppy\r
-                     using RawWrite (ask Google) and boot from the floppy\r
 \r
 There are also many invisible files used for installing MINIX 3.\r
 \r