From b665933c68e6816e281d371f08e7420659881165 Mon Sep 17 00:00:00 2001 From: Robert Peichaer Date: Sun, 19 Jul 2015 19:33:52 +0000 Subject: Use the %c (version or snapshots) and %a (package architecture) for installpath in pkg.conf instead of hardcoding that information. This fixes the problem, that installpath has a path from an older release after updating from disk for a while. NOTE: This matches fw_update behaviour in that during a beta cycle, it will expand to 5.8 (for e.g.) instead of snapshots. requested by and OK ajacoutot@ OK halex@ krw@ --- distrib/miniroot/install.sub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'distrib/miniroot/install.sub') diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index bf2cf480cf3..949ca05322c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.847 2015/07/17 15:11:52 rpe Exp $ +# $OpenBSD: install.sub,v 1.848 2015/07/19 19:33:51 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -1356,7 +1356,7 @@ install_http() { if [[ -n $_mirror ]]; then PACKAGE_PATH=$(print -r -- "$_url_base" | sed -E "/\/(snapshots|[0-9]\.[0-9])\/($ARCH)\/*$/!d - s!!/\1/packages/$(arch -s)/!;q") + s!!/%c/packages/%a/!;q") fi } -- cgit v1.2.3