Minor cleanups.

1) Don't check for the existance of /mnt/etc/hosts twice. Since we
bail out at the first check the 2nd one is superfluous.

2) Shorten and clarify the upgrade network configuration logic.

3) Always ask if manual network configuration is desired when
upgrading. Allows the upgrader to decline to use the existing network
configuration and still have an explicit opportunity to configure the
network.

4) Don't bail out if the existing network configuration fails. Instead
(see 3)) offer manual network configuration and let the user decide if
it is worthwhile to continue.

5) Refer to actual file that is missing when bailing out, rather than
forcing user to be alert enough to prepend '/mnt'.

1 files changed, 1 insertions, 9 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index a4d8f7af3d7..03edb12f610 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.305 2003/06/21 23:02:32 krw Exp $
+#	$OpenBSD: install.sub,v 1.306 2003/06/23 00:38:57 krw Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback
@@ -693,12 +693,6 @@ isalphanumeric() {
 enable_network() {
 	local _netfile
 
-	# Check for required hosts file.
-	if [ ! -f /mnt/etc/hosts ]; then
-		echo "ERROR: no /mnt/etc/hosts!"
-		return 1
-	fi
-
 	# Copy any required or optional files found
 	for _netfile in hosts dhclient.conf resolv.conf resolv.conf.tail protocols services; do
 		if [ -f /mnt/etc/${_netfile} ]; then
@@ -826,8 +820,6 @@ enable_network() {
 	else
 		echo "\nResolver not enabled."
 	fi
-
-	return 0
 }
 
 # Install a user-selected subset of the files in $2 from the source