From nobody Sun Nov 16 03:11:56 2025 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 4d8GBN4w17z6GqGV; Sun, 16 Nov 2025 03:11:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8GBN2xZzz3mxv; Sun, 16 Nov 2025 03:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262716; 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=LUJLOnIYFTd/kXw/Oy0vNGBP5U3D64EPovRmRO+0OYI=; b=h112mAv6J8J1vumwy3nSQwqYGlhY+MSqv0jlZcBe6/k5Rl2MEEeBj04tCINj7fSpFvztRo 0YgtF5TlrtDFjmr+OhwgI9mBJLd0u9so/pPYS5zerjH4G1P44n9XPS6w7+c2imDb0UHwiy b6ydDlRnx/EmUeNQENaEHNX9ZL99ewGvIvb+3CPiKS6uFyccaT3jLQr5DtUugU43zLZxLk OS1U0o1CDEYoqJkSqUWXm9tWnYNaMJXU3lNxBegMF7NHOv6JVjyuds2UFssJsn8PYgy67g Frebu6ico5hoWSMxLDn3PkaE0hw3eg8Auv/0Et84DlbpVJUk6RJhRNQX6t5SYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262716; 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=LUJLOnIYFTd/kXw/Oy0vNGBP5U3D64EPovRmRO+0OYI=; b=VsnXPy8t817CadxjhhGjXacOQOQuj23jKtuqHXmICPXYauJV7Vj1o+uKJIMwquDuBRs8O9 JpIE0m+FIJAvo0fnZQm6QFsEgpxRN14JyTFDCXnUwHcsrhxbe0vJHcxUJuOHxyoRcDmei2 3pbB+IPvrojag7IcR+lts2RS5gdf2Tmc+X/QIW1TAd0PlcYDjHxV1SrhlQcF37LulxWg9Z XRZx71LzL0YctE8KnYNB6dhu7lLggCuhbxpWWDTI+THlAXJfaFHpA40dz4b2NlHzyNGRNz GLRhp5pmenP4+WUvb6cC+Ghp7tUbyHljA1QDfCJlPZtpkq0krIybu4zDZlYrDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262716; a=rsa-sha256; cv=none; b=UxpBZwrFedp+uFZoQYEotYL1i6drKc7EQUtJIQcsR9ljN5Vi3uxDUYW9BVEhiLzfJyK2MK Es9yfH9fWeTb5b4hPEmbLW9Wv824mR0e0YDOi+EzzCSeUKB3wAUOmjFA1Og6d8AyXBWBLd Z/1wFN50o5w/8E2qLIjEv7eH0r5zprjPa22FP1XCHbZG4XJZ7fxOA3tJpE0N2tAfhyhqrb QOmIv0yDub+vygbAZpMThHY/1+xnEq1UzWG6NMPT8tQc9kKgsnphByYmP1US0bAkBG3U9b NbvFpyZQ4xsgazogNAIxef5nTNWeQXHx68RrA1tUJ+k84UZkgNg3Y3i2N2ODTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d8GBN2Gm3z4yv; Sun, 16 Nov 2025 03:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG3BukS091452; Sun, 16 Nov 2025 03:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3BurN091449; Sun, 16 Nov 2025 03:11:56 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:11:56 GMT Message-Id: <202511160311.5AG3BurN091449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d347f4a2eea6 - releng/15.0 - bsdinstall: Copy in all keys 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d347f4a2eea6ed1964bf3837c7938f6c95e3f06b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d347f4a2eea6ed1964bf3837c7938f6c95e3f06b commit d347f4a2eea6ed1964bf3837c7938f6c95e3f06b Author: Colin Percival AuthorDate: 2025-11-14 05:28:23 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:10:46 +0000 bsdinstall: Copy in all keys The keys used for pkgbase signing are going to be placed in /usr/share/keys/pkgbase-N where N is the FreeBSD major version number; as such it's not sufficient to copy /usr/share/keys/pkg into the install chroot, but instead we need /usr/share/keys/*. Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53753 (cherry picked from commit 6b0909f94099f92992fbd58eee7ce0f9289cb05e) (cherry picked from commit 7c98b725a785efd50e195b298ed279d55ca69860) --- usr.sbin/bsdinstall/scripts/pkgbase.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 5299d34fcb71..744e0daac6f8 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -337,7 +337,7 @@ local function pkgbase() -- Since pkg always interprets fingerprints paths as relative to -- the --rootdir we must copy the key from the host. assert(os.execute("mkdir -p " .. chroot .. "/usr/share/keys")) - assert(os.execute("cp -R /usr/share/keys/pkg " .. chroot .. "/usr/share/keys/")) + assert(os.execute("cp -R /usr/share/keys/* " .. chroot .. "/usr/share/keys/")) end -- We must use --repo-conf-dir rather than -o REPOS_DIR here as the latter