From: rpe <rpe@openbsd.org>
Date: Tue, 4 Apr 2017 17:50:45 +0000 (+0000)
Subject: Ensure, that during upgrades, the default for the "Location of sets"
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=85ed88132caacb072ebb070f9ff9242afa0523a1;p=openbsd

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@
---

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}