From nobody Mon Oct 24 16:01:10 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mx0DQ6gKHz4g3s3; Mon, 24 Oct 2022 16:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mx0DQ611Gz3bph; Mon, 24 Oct 2022 16:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666627270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wA6u1UYQOgRhyKa07JWi+B2QmtaWT7d7wS37nnOv148=; b=D6XplHm7YE2tE3Juhv+OOzDWJLWwbde6l3uDRFVm3P97fvh0fwgt8VJJEk7GRl2ImWVV+G EiJZOuxROq5By97oZ83EYPqpRN50imvqkSnm1VbTc7u2auYVo7VXwdSLSihoPEHGKez2is wAUuy8/gmQTJft7bZLGWMOrGTnEO6pNXG6pIkm1P4tDF2KH8YRegs4S+hae3hawPbsF2NX Lx3uCrnxmjWEpFrIujfJcpZxuGGyL8WsRlOoRv0XgOInXsQI7M23idamhxdNoDqb8BoEJA tRCBxC0a1sL8rU5mmGWruZGNgOadXlr+xAVRyyBYYVkDuTT0JP1ASWuzuRo1Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mx0DQ543QzHf1; Mon, 24 Oct 2022 16:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29OG1Ass025382; Mon, 24 Oct 2022 16:01:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OG1Abn025381; Mon, 24 Oct 2022 16:01:10 GMT (envelope-from git) Date: Mon, 24 Oct 2022 16:01:10 GMT Message-Id: <202210241601.29OG1Abn025381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a7766860e0fe - stable/13 - bsdinstall: use the correct DISTDIR for fetching local distfiles List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a7766860e0fe7e0c0b63e80c9e961346b4f86391 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666627270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wA6u1UYQOgRhyKa07JWi+B2QmtaWT7d7wS37nnOv148=; b=oNTGwglWPadjRqiNXDu30HZ0Gbo/8fimmtC6WZecyuecyRzeZhv9N/QRA/einTUR9a9iRj KOLkrH6iaYpsAgGf6oqp1KHE+mrWBUi8ljvAC75O0sGo6qR1wSZNDBYIPGZnZEey1hQzEU GlDlK+vMDwBV02foyDCUDOxvaLtHmjCcnDnFUuCn6KMQpFtJqfT8gDHA88MGI4FpEzgsU4 06Qv0r81rVvPgBrtFMEMpIt7ATJjRDvLdHHIXnEGYdY76NYVtZWNEylyKa1Wt0Ey8JXGvT Z4w56HSym/oCwftEYcIKZPF1g/R0+SyupQmhmNC5L2gTzaMsgMrZ1U/icM0uiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666627270; a=rsa-sha256; cv=none; b=vsAlI0swkcEeds1o7Ije7YQJvGo0uBAR9wYHegjInccm+vOv4loVO9oINH1AI2Wfyw3rVo 66jnRM7CMKSsv3qfqmbB4e9p4tLHxFKqZOzl1AHp24fuxuh2c+K4J1796nDdmzBwVRZu3/ 1pfSuvYMD2S0Mcnq01zoMaAi5tS+M6SAPFKzJv11TYByZi1PMafCGExnByxjFUOpky+V59 KUbrJl5wyScB0aKGSsQXoLwFuJYCyKfRxTNb46CjBBm6rtmbjN5TG79xNzUwvAEedp7aim DMIHPtndU3daxw8na+3qzMuyvNbFTv/yk0TcWay+rIYoQobH63nxm9aM09+sZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a7766860e0fe7e0c0b63e80c9e961346b4f86391 commit a7766860e0fe7e0c0b63e80c9e961346b4f86391 Author: Kyle Evans AuthorDate: 2022-10-14 05:22:09 +0000 Commit: Kyle Evans 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 (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