diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2017-04-04 17:50:46 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2017-04-04 17:50:46 +0000 |
| commit | 8d2e978f8b502d68f281ee7b221c0dd0f08da18f (patch) | |
| tree | ad3ea7494a0b995c5ea7d6cab5ddb51ea57a8d31 /distrib/miniroot | |
| parent | 4beed404f24b334fdee681048ad9b1272e775939 (diff) | |
Ensure, that during upgrades, the default for the "Location of sets"
question is set to http if /etc/installurl exists and override the
install method information from the cgi server.
'makes sense' deraadt@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 6b4ee6184fd..099b6688b49 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.989 2017/03/31 18:36:49 rpe Exp $ +# $OpenBSD: install.sub,v 1.990 2017/04/04 17:50:45 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2427,7 +2427,7 @@ install_sets() { ifconfig netboot >/dev/null 2>&1 && : ${_d:=http} # Set default location to HTTP if installurl(5) exists. - [[ -s /mnt/etc/installurl ]] && : ${_d:=http} + [[ -s /mnt/etc/installurl ]] && _d=http # Set default location to the first cdrom device if any are found. [[ -n $_cddevs ]] && : ${_d:=cd0} |