From 5e9a8f05ffccfeb78559d5047d0a0a116a22d314 Mon Sep 17 00:00:00 2001
From: David van Moolenbroek <david@minix3.org>
Date: Wed, 23 Dec 2009 23:59:32 +0000
Subject: [PATCH] unbreak building CDs

---
 tools/mkboot                | 14 +++++++++-----
 tools/release.sh            |  5 +++--
 tools/release/cd/README.TXT |  3 ---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/mkboot b/tools/mkboot
index 7c6344ea4..e12f7c336 100755
--- 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 bb614cf97..57fb0e732 100755
--- 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 6572e30b5..b69e0b8c7 100644
--- a/tools/release/cd/README.TXT
+++ b/tools/release/cd/README.TXT
@@ -45,9 +45,6 @@ CD CONTENTS:
 This CD contains:
 
    - README.TXT      This file
-   - BOOTFLOP.IMG    If you cannot boot from CD-ROMs, insert the CD-ROM
-                     anyway, then copy this floppy image raw to a floppy
-                     using RawWrite (ask Google) and boot from the floppy
 
 There are also many invisible files used for installing MINIX 3.