Complete yet more of the c2k2 initiated changes. In this round:

1) Centralize selection of install/upgrade media rather than ask
   separately for mounted filesystem. Eliminate separate calls
   to get_localdir in install.sh and upgrade.sh. In install.sh
   this call occurred only if a diskless system was detected, which
   millert@ agreed was a historical relic, i.e. what exactly would
   a diskless workstation be installing to?

2) Check for the presence of any mounted filesystems at the expected
   mount point (/mnt or /mnt2) and emit an error message if none found.

3) Add a '?' option to the pathname question so you can see what
   filesystems are mounted at/below the expected mount point.

4) Rework logic in get_localdir to make flow more logical. e.g. only
   do sane_install() check after the user says to install no more sets;
   if sane_install() fails ask a slightly different question and make
   the default 'y' to install more sets.

5) Rework install_sets() to simplify logic. Don't try to tailor
   list of install media to system, just warn that some may not be
   available and emit useful error messages if the user tries a
   non-available source.

Some verbiage still needs work (amoung other things).

fgsch@ noticed problems with installing from mounted filesystems, forcing me
to finish these changes.

1 files changed, 1 insertions, 13 deletions

diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 51ba71f3780..0237cb9187f 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.102 2002/05/20 16:53:57 krw Exp $
+#	$OpenBSD: install.sh,v 1.103 2002/06/25 00:31:59 krw Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -280,18 +280,6 @@ fi
 
 mount_fs "-o async"
 
-mount | while read line; do
-	set -- $line
-	if [ "$3" = "/" -a "$5" = "nfs" ]; then
-		echo "You appear to be running diskless."
-		ask "Are the install sets on one of your currently mounted filesystems?" n
-		case $resp in
-		y*|Y*)	get_localdir
-			;;
-		esac
-	fi
-done
-
 echo '\nPlease enter the initial password that the root account will have.'
 _oifs=$IFS
 IFS=