diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-04-27 18:05:34 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-04-27 18:05:34 +0000 |
| commit | d7b060eb2cad6f74c927ad9817cb875c33ae3e7f (patch) | |
| tree | acdaf505dba1e1dcb7d2c88667744617fe017598 /distrib/miniroot | |
| parent | f0737604e8f2b59a8582e9bad166107658745296 (diff) | |
if we netbooted (i.e. ifconfig -g netboot doesn't return an error),
select ftp rather than cd by default.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 000893c7915..c574074c406 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.489 2009/04/26 21:21:12 deraadt Exp $ +# $OpenBSD: install.sub,v 1.490 2009/04/27 18:05:33 sthen Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1352,6 +1352,7 @@ install_sets() { local _d=disk _locs="disk ftp http" [[ -n $CDDEVS ]] && { _locs="cd $_locs" ; _d=cd ; } + ifconfig -g netboot > /dev/null 2>&1 && _d=ftp [[ -x /sbin/mount_nfs ]] && _locs="$_locs nfs" [[ -n $MTDEVS && -x /bin/mt ]] && _locs="$_locs tape" |