Ruthlessly expunge unnecessary verbiage and whitespace to make sure

the install example will easily fit on the CD insert at some
reasonable font size. Reword many messages and questions for same
reason.

In addition:

1) Add '...done.' to match 'Installing boot block...'

2) During install, after asking which is the root disk, start
initializing it immediately rather than asking again which disk to
work on.

3) Move munged fstab filesystem mounting to *before* network
initialization so that if you bail out during network initialization
and restart you do not have to go through disk initialization again.
Also puts fsck and mount messages close to each other rather than
spitting out the latter just before root password questions.

4) Make 'usr/obj' nosuid,nodev by default, /home nodev by default.

5) For network interfaces only show the complete list of media options
if the user indicates they want to change the default.

6) Move the question about the ftp server supporting passive ftp to
*after* selecting the ftp server where it is more 'rational' and can
easily be made more concise.

7) Don't bother umount'ing filesystems or stopping the dhclient after
a successful install/upgrade. The next step is a reboot after all.

Some minor code tweaks and comment cleanup while in the area.

Tested in recent snapshots. Suggested by & ok deraadt@.

1 files changed, 10 insertions, 33 deletions

diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh
index f7966745aef..bad3fccdd14 100644
--- a/distrib/miniroot/upgrade.sh
+++ b/distrib/miniroot/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.41 2002/08/27 02:18:34 krw Exp $
+#	$OpenBSD: upgrade.sh,v 1.42 2002/09/17 12:28:54 krw Exp $
 #	$NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -56,8 +56,7 @@ MODE=upgrade
 # work!
 THESETS=`echo $THESETS | sed -e 's/ etc / /'`
 
-# Assume $ROOTDEV is the root filesystem. Confirm
-# this with the user. Check and mount the root filesystem.
+# Have the user confirm that $ROOTDEV is the root filesystem.
 resp=
 while [ -z "$resp" ]; do
 	ask "Root filesystem?" "$ROOTDEV"
@@ -94,14 +93,7 @@ done
 
 # Start up the network in same/similar configuration as the installed system
 # uses.
-cat << __EOT
-
-The upgrade program would now like to enable the network. It will use the
-configuration already stored on the root filesystem. This is required
-if you wish to use the network installation capabilities of this program.
-
-__EOT
-ask "Enable network?" y
+ask "Enable network using configuration stored on root filesystem?" y
 case $resp in
 y*|Y*)
 	if ! enable_network; then
@@ -109,15 +101,7 @@ y*|Y*)
 		exit
 	fi
 
-	cat << __EOT
-
-You will now be given the opportunity to escape to the command shell to
-do any additional network configuration you may need. This may include
-adding additional routes, if needed. In addition, you might take this
-opportunity to redo the default route in the event that it failed above.
-
-__EOT
-	ask "Escape to shell?" n
+	ask "Do you want to do more, manual, network configuration?" n
 	case $resp in
 	y*|Y*)	echo "Type 'exit' to return to upgrade."
 		sh
@@ -127,22 +111,17 @@ __EOT
 esac
 
 cat << __EOT
+
 The fstab is configured as follows:
 
 $(</tmp/fstab)
 
-You may wish to edit the fstab before the filesystems are mounted. e.g. to
-change the order in which the filesystems are mounted.
-
-NOTE:	1) the edited fstab will be used only during the upgrade. It will not
-           be copied back into the root filesystem.
+You can edit the fstab now, before it is used, but the edited fstab will
+only be used during the upgrade. It will not be copied back to disk.
 
-	2) A filesystem will not be mounted if
-		a) the 'noauto' option is present,
-		b) /sbin/mount_<fstype> is not found,
-		c) the fstype is nfs.
-
-	3) Non-ffs filesystems will be mounted read-only.
+Filesystems in the fstab will be mounted only if the 'noauto' option is
+absent, /sbin/mount_<fstype> is found, and the fstype is not nfs. Only
+filesystems with a fstype of ffs will be mounted read-write.
 
 __EOT
 ask "Edit the fstab with ${EDITOR}?" n
@@ -151,8 +130,6 @@ y*|Y*)	${EDITOR} /tmp/fstab
 	;;
 esac
 
-echo
-
 # Create /etc/fstab.
 munge_fstab