diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-04-19 00:49:21 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-04-19 00:49:21 +0000 |
| commit | fbeffae3fc043a69dcfaf352e974db62904acd1a (patch) | |
| tree | d10f7ceedd1b28ee088f67d089aa992518d1b4f8 | |
| parent | 399f326aa21d1115103d7b6398f946a772522199 (diff) | |
There is no reliable way to detect a working network interface. So
always offer ftp and http as set sources.
Problem noted by uwe@, ok deraadt@
| -rw-r--r-- | distrib/miniroot/install.sub | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 603e2411f04..d770ee0c1b5 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.383 2005/04/18 23:56:21 deraadt Exp $ +# $OpenBSD: install.sub,v 1.384 2005/04/19 00:49:20 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback @@ -1320,13 +1320,10 @@ sane_install() { # user selects from that location. Repeat as many times as the user # needs to get all desired sets. install_sets() { - local _d=disk _locs=disk + local _d=disk _locs="disk ftp http" [[ -n $CDDEVS ]] && { _locs="cd $_locs" ; _d=cd ; } - if [[ -n $(ifconfig | grep 'status: active') ]]; then - _locs="$_locs ftp http" - [[ -x /sbin/mount_nfs ]] && _locs="$_locs nfs" - fi + [[ -x /sbin/mount_nfs ]] && _locs="$_locs nfs" [[ -n $MTDEVS && -x /bin/mt ]] && _locs="$_locs tape" echo "\nLet's $MODE the sets!" |