Cleanup, new features, shrinkage.

Remove chunk of commented out, unused code.

Add _didnet=1 to enable_network() so that ftp upgrade
does not ask for network information it already has.

Tell a user that selects the http installation method
that the files will be downloaded via http.

Suppress all 'softdep' options in fstab_shadow so
there are no warnings when the filesystems are
mounted.

Suppress all non-ffs (including nfs, ufs) filesystems
from fstab_shadow. Ufs was never used to install
OpenBSD.

Suppress all 'noauto' filesystems from fstab_shadow.

Reword some comments and messages, esp. the one
just before the offer to edit fstab. Punch up the
fact that the fstab will not be saved, mention
that non-ffs and noauto filesystems will be
ignored.

Move

   /usr/X11R6/lib/X11/{rstart,twm,xkb,xsm,xinit}

directories to

   /usr/X11R6/lib/X11/XF3{rstart,twm,xkb,xsm,xinit}

and replace with links. Links can be overwritten
during upgrade. Directories can't. This enables the
upgrade from XFree86 3.x to XFree86 4.x.

ok deraadt@ millert@

1 files changed, 1 insertions, 26 deletions

diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 01b9082e041..27b276d2993 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.76 2001/04/16 19:43:27 krw Exp $
+#	$OpenBSD: install.sh,v 1.77 2001/04/20 01:55:51 krw Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -329,31 +329,6 @@ if [ "`df /`" = "`df /mnt`" ]; then
 		done
 	) < ${FILESYSTEMS} > /tmp/fstab
 
-# XXX We no longer do the following. It is not necessary. It can be done
-# XXX after the install is complete.
-#
-#	echo	"The fstab is configured as follows:"
-#	echo
-#	cat /tmp/fstab
-#	cat << \__fstab_config_1
-#
-#You may wish to edit the fstab.  You may also wish to take this opportunity to
-#place NFS mounts in the fstab  (this would be especially useful if you plan to
-#keep '/usr' on an NFS server.
-#__fstab_config_1
-#	echo -n	"Edit the fstab with ${EDITOR}? [n] "
-#	getresp "n"
-#	case "$resp" in
-#		y*|Y*)
-#			${EDITOR} /tmp/fstab
-#			;;
-#
-#		*)
-#			;;
-#	esac
-#
-#	echo
-
 	munge_fstab /tmp/fstab /tmp/fstab.shadow
 	mount_fs /tmp/fstab.shadow "-o async"
 fi