More nits and polish

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index 5cfe490115a0be591e8ea60816b1431a959173ed..e19eb048f172dda9421f535085c005a897db80ea 100755 (executable)
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -238,11 +238,11 @@ echo "
  --- Step 4 --- Block size -------------------------------------------
 "
 echo "\
-The default block size on the disk is $blockdefault KB. However, sizes of 1 to $blockdefault KB
-are also supported. If you have a small disk or small RAM you may want less
-than $blockdefault KB, in which case type a block size from 1 to 8 (1, 2, 4 or $blockdefault are
-suggested values). Otherwise hit ENTER for the default of $blockdefault KB blocks, which
-should be fine in most cases."
+The default block size on the disk is $blockdefault KB.
+If you have a small disk or small RAM you may want less
+than $blockdefault KB. Please type 1, 2, or 4 for a smaller
+block size (in KB), or hit ENTER for the default of 
+$blockdefault KB blocks, which should be fine in most cases."
 
 while [ -z "$blocksize" ]
 do     echo -n "Block size [$blockdefault KB]? "
@@ -250,8 +250,8 @@ do  echo -n "Block size [$blockdefault KB]? "
        if [ -z "$blocksize" ]
        then    blocksize=$blockdefault
        fi
-       if [ $blocksize -gt $blockdefault -o $blocksize -lt 1 ]
-       then    echo "$blocksize bogus block size. 1-$blockdefault please."
+       if [ "$blocksize" -ne 1 -a "$blocksize" -ne 2 -a "$blocksize" -ne 4 -a "$blocksize" -ne $blockdefault ]
+       then    echo "$blocksize bogus block size. 1, 2, 4 or $blockdefault please."
                blocksize=""
        fi
 done
@@ -376,7 +376,7 @@ if [ -n "$driver" ]
 then   echo "eth0 $driver 0 { default; };" >/mnt/etc/inet.conf
        echo "$driverargs" >$LOCALRC
        disable=""
-else   disable=inet
+else   disable="disable=inet;"
 fi
 
 umount /dev/$root || exit              # Unmount the new root.
@@ -398,7 +398,7 @@ if [ $cache -eq 0 ]; then cache=; else cache="ramsize=$cache"; fi
 
                                        # Make bootable.
 installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit
-edparams /dev/$root "rootdev=$root; ramimagedev=$root; disable=$disable; $cache; main() { echo This is the MINIX 3 boot monitor.; echo MINIX will load in 5 seconds, or press ESC.; trap 5000 boot; menu; }; save" || exit
+edparams /dev/$root "rootdev=$root; ramimagedev=$root; $disable $cache; main() { echo This is the MINIX 3 boot monitor.; echo MINIX will load in 5 seconds, or press ESC.; trap 5000 boot; menu; }; save" || exit
 pfile="/usr/src/tools/fdbootparams"
 echo "Remembering boot parameters in ${pfile}."
 echo "rootdev=$root; ramimagedev=$root; $cache; save" >$pfile || exit

diff --git a/tools/release.sh b/tools/release.sh
index b6d35b7a8c0c8754dda5f9173f9b9843709d9212..dd0d1aca4064d153acf72ac326d8b76f970aa8fa 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -32,6 +32,7 @@ umount $TMPDISK
 umount $RAM
 
 ( cd .. && make clean )
+( cd .. && make depend )
 echo " * Cleanup old files"
 rm -rf $RELEASEDIR $ISO $IMAGE $ROOTIMAGE $ISOGZ $CDFILES
 mkdir -p $CDFILES || exit
@@ -67,7 +68,7 @@ make programs image
 (cd ../boot && make)
 make image || exit 1
 sh mkboot cdfdboot
-cp cdfdboot $CDFILES/bootflp.img
+cp $IMAGE $CDFILES/bootflp.img
 cp release/cd/* $CDFILES
 writeisofs -l MINIX -b $IMAGE $CDFILES $ISO || exit 1
 echo "Appending Minix root and usr filesystem"

diff --git a/tools/release/cd/README.TXT b/tools/release/cd/README.TXT
index 02b99c8aec499a52228016a192eeb3998a499f0e..d51ac032cd333c46e35613d4faaa4990dccc1fc4 100644 (file)
--- a/tools/release/cd/README.TXT
+++ b/tools/release/cd/README.TXT
@@ -8,6 +8,10 @@ harddisk with it. Its contents are not visible here.
 In this directory:\r
        README.TXT: This file.\r
        PRESZ134.ZIP: A tool to help resizing partitions.\r
+       BOOTFLP.IMG: If you can't boot from CD, write this image to a\r
+                    floppy and boot from it, while having the CD in a\r
+                    CD drive. The system on the floppy should find the\r
+                    CD and start up as if it had been booted from CD.\r
 \r
 For more information, new releases, other software and documentation\r
 about MINIX 3, please visit:\r