diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2010-06-26 20:44:16 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2010-06-26 20:44:16 +0000 |
| commit | b37c10f4620a355d7fe8b725f274b26315f0c387 (patch) | |
| tree | 3ef54d84c9246fe8e7c59b6bfe510c448d42a5e1 | |
| parent | 6202527128bd4dafa6ffc7be97d461198ecc0a62 (diff) | |
make http the default network install method rather than ftp
ok krw@
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 95e8c421abb..c72c6e5697a 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.604 2010/06/21 02:54:46 krw Exp $ +# $OpenBSD: install.sub,v 1.605 2010/06/26 20:44:15 halex 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 @@ -1494,14 +1494,14 @@ install_sets() { [[ -s $SERVERLISTALL ]] && \ _d=$(sed -ne '/^method=/s/method=//p' $SERVERLISTALL) - ifconfig netboot >/dev/null 2>&1 && : ${_d:=ftp} + ifconfig netboot >/dev/null 2>&1 && : ${_d:=http} [[ -n $(get_cddevs) ]] && { _locs="cd $_locs" ; : ${_d:=cd} ; } [[ -x /sbin/mount_nfs ]] && _locs="$_locs nfs" [[ -n $MTDEVS && -x /bin/mt ]] && _locs="$_locs tape" - : ${_d:=ftp} + : ${_d:=http} if ! isin "$_d" $_locs; then - for a in ftp http cd nfs tape disk; do + for a in http ftp cd nfs tape disk; do isin $a $_locs && _d=$a && break done fi |