diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-07-23 17:55:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-07-23 17:55:46 +0000 |
| commit | 5cff26580e2d3efb31914a32c04b966736089c99 (patch) | |
| tree | 4a53dd9135e70ec55932c8b8b6a3dad02a58d3f4 /distrib | |
| parent | a71c172052fd80cadee043b722a135bc7d55f574 (diff) | |
Back out the automatic pkg.conf installpath changes; because pkg_add has
an immature heuristic for "what is a release and what is a snapshot".
This change maybe improved the post-release experience, but it damages the
pre-release experience, which may result in less effective pre-release
testing, which risks creating poor releases, which may result in poor
post-release experiences.
Specific case: subtle breakage to fw_update.
Diffstat (limited to 'distrib')
| -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 1db18037299..359bba51a49 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.901 2016/05/27 21:13:17 deraadt Exp $ +# $OpenBSD: install.sub,v 1.902 2016/07/23 17:55:45 deraadt Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1495,7 +1495,7 @@ install_http() { if [[ -n $_mirror ]]; then PACKAGE_PATH=$(print -r -- "$_url_base" | sed -E "/\/(snapshots|[0-9]\.[0-9])\/($ARCH)\/*$/!d - s!!/%c/packages/%a/!;q") + s!!/\1/packages/$(arch -s)/!;q") fi } |