diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-07-18 00:46:15 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-07-18 00:46:15 +0000 |
| commit | 7763763262558661268e8108768d1672cc45c574 (patch) | |
| tree | db7551ebf1e8ba180cdf134db7135402f1da956d /distrib/miniroot | |
| parent | 8605dcef99499613c9251fd806dac8fae235b810 (diff) | |
For set installation via URL or NFS, assume the network has been configured
to the user's satisfaction.
ok tdeval@ deraadt@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index beb86b750aa..d2ac8d222e2 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.346 2004/07/17 03:46:12 krw Exp $ +# $OpenBSD: install.sub,v 1.347 2004/07/18 00:46:14 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -682,8 +682,6 @@ enable_network() { fi done - DIDNET=y - # Set the address for the loopback interface. Bringing the # interface up, automatically invokes the IPv6 address ::1. ifconfig lo0 inet 127.0.0.1 @@ -928,8 +926,6 @@ ftp_error() { install_url() { local _url_type=$1 _file_list _url_base _oifs _prompt _passwd - donetconfig - ask "HTTP/FTP proxy URL? (e.g. 'http://proxy:8080', or 'none')" \ "${ftp_proxy:-none}" unset ftp_proxy http_proxy @@ -1251,8 +1247,6 @@ install_nfs() { return fi - donetconfig - # Get the IP address of the server ask_until "Server IP address or hostname?" "$_nfs_server_ip" _nfs_server_ip=$resp @@ -1603,10 +1597,6 @@ get_fqdn() { donetconfig() { local _dn _ns - [[ -n $DIDNET ]] && return - - DIDNET=y - configure_ifs # As dhclient will populate /etc/resolv.conf, a symbolic link to |