unbreak building CDs

This commit is contained in:
David van Moolenbroek 2009-12-23 23:59:32 +00:00
parent 692dc020e1
commit 5e9a8f05ff
3 changed files with 12 additions and 10 deletions

View file

@ -9,10 +9,10 @@ mdec=/usr/mdec # bootstraps
# Check arguments. # Check arguments.
case "$#:$1" in case "$#:$1" in
1:bootable | 1:hdboot | [12]:fdboot | [12]:cdfdboot ) 1:bootable | 1:hdboot | [12]:fdboot | [123]:cdfdboot )
action=$1 dev=$2 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 exit 1
esac esac
@ -169,8 +169,12 @@ cdfdboot)
ramdisk `expr 1440 \* 1024` 2>/dev/null ramdisk `expr 1440 \* 1024` 2>/dev/null
dev=/dev/ram dev=/dev/ram
fi fi
if [ -z "$size" ]
then
size=1440
fi
umount $dev 2>/dev/null 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 : then :
else else
echo "mkfs of $dev failed." echo "mkfs of $dev failed."
@ -203,7 +207,7 @@ main(){trap 10000 boot; menu; };
save' || exit save' || exit
# copy image # copy image
dd if=$dev of=cdfdimage bs=8192 count=180 dd if=$dev of=cdfdimage bs=1024 count=$size
esac esac
sync sync
exit 0 exit 0

View file

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

View file

@ -45,9 +45,6 @@ CD CONTENTS:
This CD contains: This CD contains:
- README.TXT This file - 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. There are also many invisible files used for installing MINIX 3.