diff options
| author |   krw <krw@openbsd.org> | 2005-04-13 03:45:51 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2005-04-13 03:45:51 +0000 |
| commit | d1a87894273a573355e1e62fcf0158604f8cae0c (patch) | |
| tree | 83e3863c8821b0d1d2caddd09062c09d72fe49d1 | |
| parent | spacing (diff) | |
| download | wireguard-openbsd-d1a87894273a573355e1e62fcf0158604f8cae0c.tar.xz wireguard-openbsd-d1a87894273a573355e1e62fcf0158604f8cae0c.zip | |
Tweak set source option testing. Don't offer nfs if no active interface
is found - even if /sbin/mount_nfs is present.
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 9c0f2a8551b..66b8c1161f0 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.380 2005/04/13 03:12:42 deraadt Exp $ +# $OpenBSD: install.sub,v 1.381 2005/04/13 03:45:51 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 @@ -1330,8 +1330,10 @@ install_sets() { local _d=disk _locs=disk [[ -n $CDDEVS ]] && { _locs="cd $_locs" ; _d=cd ; } - [[ -n $(ifconfig | grep 'status: active') ]] && _locs="$_locs ftp http" - [[ -x /sbin/mount_nfs ]] && _locs="$_locs nfs" + if [[ -n $(ifconfig | grep 'status: active') ]]; then + _locs="$_locs ftp http" + [[ -x /sbin/mount_nfs ]] && _locs="$_locs nfs" + fi [[ -n $MTDEVS && -x /bin/mt ]] && _locs="$_locs tape" echo "\nLet's $MODE the sets!" |