summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2018-05-07 10:44:02 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2018-05-07 10:44:02 +0000
commit0ad1afcca1c8f1c217e06fb4b08c3bad617c14c4 (patch)
treec8ad2877c08e9153493121c3e3b6f2bf728e6a4b /distrib/miniroot
parent00603109f3b58677512fcac0a78561f9b1582f61 (diff)
Fix http install with proxy, which was broken since URL redirection was
made sticky. Found and fix suggested by joshua megerman () iwco com, thanks! Tested & ok rpe
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub4
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index c6970521e36..29571018e5d 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1066 2018/03/15 17:43:54 anton Exp $
+# $OpenBSD: install.sub,v 1.1067 2018/05/07 10:44:01 tb Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -1802,7 +1802,7 @@ install_http() {
# In case of URL redirection, use the final location to retrieve the
# rest of the files from. Redirection does not change INSTALL_MIRROR.
_rurl_base=$(sed -n 's/^Requesting //p' $_ftp_stdout | sed '$!d')
- _rurl_base=${_rurl_base%/SHA256.sig}
+ _rurl_base=${_rurl_base%/SHA256.sig*}
# Verify SHA256.sig, write SHA256 and extract the list of files.
if unpriv -f $_sha \