git: c6d3831e5492 - stable/12 - bsdinstall: Fix mirror selection
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 18 Nov 2021 07:09:44 UTC
The branch stable/12 has been updated by 0mp (doc, ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=c6d3831e54921c55c8297f5fcccf31f62b8bf324
commit c6d3831e54921c55c8297f5fcccf31f62b8bf324
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2021-11-10 15:39:09 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-11-18 07:09:00 +0000
bsdinstall: Fix mirror selection
This is a follow-up to 2697622687708bffd4c3dcfc44f0c977a78e506d,
which fixed 2 out of 3 broken uses of the mirrorselect script.
Reviewed by: emaste
Approved by: emaste (src)
MFC after: 7 days
Differential Revision: https://reviews.freebsd.org/D32927
(cherry picked from commit 4042b356a00e12d6888a4e15e2373453804c5121)
---
usr.sbin/bsdinstall/scripts/jail | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
index ecfbb78357d9..13a6de0846a9 100755
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -95,7 +95,7 @@ FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS` # Trim white space
if [ -n "$FETCH_DISTRIBUTIONS" -a -z "$BSDINSTALL_DISTSITE" ]; then
exec 3>&1
- BSDINSTALL_DISTSITE=`bsdinstall mirrorselect 2>&1 1>&3`
+ BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
MIRROR_BUTTON=$?
exec 3>&-
test $MIRROR_BUTTON -eq 0 || error "No mirror selected"