git: a7766860e0fe - stable/13 - bsdinstall: use the correct DISTDIR for fetching local distfiles
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 24 Oct 2022 16:01:10 UTC
The branch stable/13 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=a7766860e0fe7e0c0b63e80c9e961346b4f86391
commit a7766860e0fe7e0c0b63e80c9e961346b4f86391
Author: Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2022-10-14 05:22:09 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2022-10-24 16:01:01 +0000
bsdinstall: use the correct DISTDIR for fetching local distfiles
fetchmissingdists naturally sets BSDINSTALL_DISTDIR to a directory in
the new filesystem that it can write fetched distfiles to. As a result,
BSDINSTALL_DISTSITE was incorrectly set to the scratch space on /mnt for
the call to distfetch when grabbing local distfiles, and it would
subsequently fail.
Switch to using the copy of BSDINSTALL_DISTDIR that we stashed off
coming into fetchmissingdists; this one is in-fact set to the path where
the local distfiles are stored.
Patch suggested by jrtc27.
Reported and tested by: Daniel O'Connor <darius dons net au>
(cherry picked from commit 12b92f3ed82aa71c0eba246ce3053ef225724570)
---
usr.sbin/bsdinstall/scripts/fetchmissingdists | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/bsdinstall/scripts/fetchmissingdists b/usr.sbin/bsdinstall/scripts/fetchmissingdists
index 768217e2fb8c..d96ddabb2c25 100644
--- a/usr.sbin/bsdinstall/scripts/fetchmissingdists
+++ b/usr.sbin/bsdinstall/scripts/fetchmissingdists
@@ -85,7 +85,7 @@ fi
if [ ! -z "$LOCAL_DISTRIBUTIONS" ]; then
# Copy local stuff first
env DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS" \
- BSDINSTALL_DISTSITE="file://$BSDINSTALL_DISTDIR" \
+ BSDINSTALL_DISTSITE="file://$BSDINSTALL_DISTDIR_ORIG" \
bsdinstall distfetch || \
error "Failed to fetch distribution from local media"
fi