From nobody Fri Oct 14 05:26:23 2022 X-Original-To: dev-commits-src-all@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 4MpZcc23F6z4fd4G; Fri, 14 Oct 2022 05:26:24 +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 4MpZcb6rQVz3QQY; Fri, 14 Oct 2022 05:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665725184; 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=rVvqBj1QdW7J1ZtrRhV6cYUuFYfQl4dm/tsbHzdRJcg=; b=I4+h/Gg+6+iVkp1aS6orhHW9IopegEyC56+uWDrUfIyJzeOWmcGADMjsEam7HmNuCmy6AP uXm+0dL736MtuSZqTSKsLlUg5KJb6VIr7p+HLQKJGgUzuWEbF5FyssExb+p1vuwZ8sxHWW wsZk2v8a+WgMSaNKtzCMGMuHvM+CPvoTsG+Z2CMD5J00TrPWnneJaAoVPXBwyZGHbMusg6 SEzCUSrdup7q2Zo2n2k85olczbUjpk55HKkhSSkAcOQfALRmDd2j6/KHvS9v/6avCWIIp0 38vFh/ndsOvIWZGRio6kGbGUkd6E9v0iwRvcIEqBzUxo5V7Lm3V0FmcxHbUqRA== 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 4MpZcb5tqFzgN5; Fri, 14 Oct 2022 05:26:23 +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 29E5QNcx041784; Fri, 14 Oct 2022 05:26:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29E5QNmi041783; Fri, 14 Oct 2022 05:26:23 GMT (envelope-from git) Date: Fri, 14 Oct 2022 05:26:23 GMT Message-Id: <202210140526.29E5QNmi041783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 12b92f3ed82a - main - bsdinstall: use the correct DISTDIR for fetching local distfiles List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 12b92f3ed82aa71c0eba246ce3053ef225724570 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665725184; 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=rVvqBj1QdW7J1ZtrRhV6cYUuFYfQl4dm/tsbHzdRJcg=; b=c/2gAj+ipttPy8tL03Xaupt/D8X7yOKc+c4A0vu3zF0v0LEacmW34EBbcgXwn2LPXUk1UM Ee27dCMP/jerMg3OCdgIOHQV/7WV/POxkA3aE1kxOiCdgmCFKxdyfwM1heY+58/AEunmYi VfzyMHm5vtqFmU/S+s5zfVdgcQkm3INcucMqhzjhH2Pl+dz6DpyHDQAT515vaKn0aDOrAB jlv1gRtiQ6eIZF1evVPCDrs/8KCne+P1EG66kRPgHNHnJcOJ566My85VuGDEtKGsm3IKyx Z5SE/y/5l5R1OWeZHvzcD6OtMaduOdrAeaZWNhUFtw5gvhVx7KcG1A7gchAElA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665725184; a=rsa-sha256; cv=none; b=HNG7aoZ9fCVxEHTrhyEFK9paMoyns081I7xAS9r3ARVuOICcsrG5jMXpINMU3bjd7pO+nq ++5QAzA3KilhnMNdyvU6tlBc1juzZcphPrDpUTHZSuEAMMykYeBTe6jiVIMTIe6WGG0H7i q+joHVR0WNYlN/pzhD7gD24LSEHzI6vf6prEz+haYaHMxwi99CxiDLmQf/WHwp0ekOxZQa A4JAF1T4n0E8aZ2oAXi36buwN/qB1qDCSrt+il8n0lX8ifvHTp+fVxaDECfrlLeik33XGY FOvXpcVwxDJIzMzOZisZb0FUGww7r9WyQkeTOOXSyyaLNXCt8KJqCnDt1ZCB+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=12b92f3ed82aa71c0eba246ce3053ef225724570 commit 12b92f3ed82aa71c0eba246ce3053ef225724570 Author: Kyle Evans AuthorDate: 2022-10-14 05:22:09 +0000 Commit: Kyle Evans CommitDate: 2022-10-14 05:22:09 +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 MFC after: 1 week --- 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 586058272e71..a182ed517b75 100644 --- a/usr.sbin/bsdinstall/scripts/fetchmissingdists +++ b/usr.sbin/bsdinstall/scripts/fetchmissingdists @@ -88,7 +88,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