From nobody Sun Nov 16 02:04:25 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 4d8DhV0jv9z6GjYL; Sun, 16 Nov 2025 02:04:26 +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 4d8DhV004bz3cGy; Sun, 16 Nov 2025 02:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258666; 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=DIE39neAcyflqp6RfvPe/Jh6QeeW9unJX7NZjvDobMo=; b=mndEQGAH+vp4sFcAc0jzf2E+FebZ/+s5Lsoz9uVRCBSgw6Z0tM0ITa8KlI3P9Gy+eatgVj X+WJ+HTLMnqMReTtLncyFFipEmvNhZkDqtEiCMd2a0MwuwIcX6WlKlcYe2mApE7hoaRmte exTuuSjguzn74rJkhQQEeSaEZl0a8GYSqPBHYj+/LIUewCAa5IB6UY0h6eyrJ4H9k7YiyN KpeuD/RsjtWA1i0niPImLpx9dc4r1QfBileYkm9KmPnprXlvJz7/N4NbMhkPRLpVUXLX6G jdGwlADNSG/jAWi5QWDBb4WA7J9y9GgWEdizf2IcA7V/Kp0bnCzMbEW1vbIIrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258666; 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=DIE39neAcyflqp6RfvPe/Jh6QeeW9unJX7NZjvDobMo=; b=NkQgl305Gkhpa8qLVavXbsMLi2L6EijBu510Bg3+Otq2IWRNN9PHVh8xqEPyDmZxDSuzzO rNI0ypl5ZEf+JTkheHcP2HPgyFzD8s8bxJn0X8fwyzWwvMSkIKfIVYxVGjqPqHP3d8VRUv 0ZG45sEgHgx8T5fbmH3PHyj0b03bNBCKyadsH1dQ0F+LT+iu+5k0GnJ4V9AT5dq/DURo+1 GWyTG/7mtUoe4iE8hv0M57kbFLOAV06yqZKce2qW+XcY1a+/rGnHnMwIT1zlXYf4/5KIov eoNIKcemUsbEr1bMw6tbA2HGqgeORXyphEQxdQ6idZp6FD5Cv5kbZiKxqG/YAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258666; a=rsa-sha256; cv=none; b=G2cTmRSTVAQqAtAbT2kDEghJi41Yv7RG7Z9iCzK0NoRow8g2MvO+O8honFqYW/KVGcVcv1 5/y0IYnHtcif99/uJ2jBF+HEF93WH6zttaXiyoJ39fhroaeNvX8q/D8ZwIhc0NKW3lDI2z TZSLrXLMa1/Hr/qDaornVOgesLxEA3Wb69Nim5m/Rxo//0/dqke4unvGqJsOMK+9SlkH3e GeEvEja3R7vX0xe3gMB5bBDi2xLpI5Q0WCN/zJc6Nlo6oML1FwQdcqoLzMzGKhSu9rVR43 iJcTNOX4hTZT9yLppEVpbgINN5HLVFhyje4NeG2WGTwHwGjLE2gvTGU9/YI+WQ== 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 4d8DhT6jKGz3MV; Sun, 16 Nov 2025 02:04:25 +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 5AG24P1S060738; Sun, 16 Nov 2025 02:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24PSd060735; Sun, 16 Nov 2025 02:04:25 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:25 GMT Message-Id: <202511160204.5AG24PSd060735@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: 7c98b725a785 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c98b725a785efd50e195b298ed279d55ca69860 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7c98b725a785efd50e195b298ed279d55ca69860 commit 7c98b725a785efd50e195b298ed279d55ca69860 Author: Colin Percival AuthorDate: 2025-11-14 05:28:23 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +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/*. With hat: re MFC after: 8 hours (needed in 15.0-RC1) Differential Revision: https://reviews.freebsd.org/D53753 (cherry picked from commit 6b0909f94099f92992fbd58eee7ce0f9289cb05e) --- 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