From nobody Sat Nov 15 07:58:54 2025 X-Original-To: dev-commits-src-main@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 4d7mbz0kJyz6HKj9; Sat, 15 Nov 2025 07:58:55 +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 4d7mby74Rjz3NhR; Sat, 15 Nov 2025 07:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193535; 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=80MDG6yGAvzb022PrjKYfECo4NLKd97Jg3O5CEH5K9k=; b=lBMNo6b2cwyfEVAGHTGZQObyn4nahwBnpR063TgXWV+4jgS4JGDTo8UDwrYskokh3IAyCd zPJlNzba9RBs7bR/TdAmU3ftSl6e+AlZ564pcL0s3Qt/8syufgabbbx5wvQ5XyNMvCeD9t 6J1LbL4ZLVgGPmoxF1uVdPYuQNpQ8Z/rDB7+vw4ndomUKEY8kzOgFnElDGA++FFg6nVeYU GBbLNcBUCMf8slZ1XrCNGMn+xf60H7/RTaNMf9GGOyCw9dTpAvHLmAb1/Rjx2/qGepHIwc vC9hWJSMnd3tFIysueOcirwhVYQeQ9+n02eCH13b31N/FvMrMCKeeuPYca96nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193535; 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=80MDG6yGAvzb022PrjKYfECo4NLKd97Jg3O5CEH5K9k=; b=wv/ps03P/8XeKkIzyNPeRUO3m8vrVQF1NWCuYkAV8sL7hVn2QWhQCODOJL+1SCtSJxDRX6 Ilq49gnhn8nudez4Ixib/SceTSB0n+gdTKeE0Q18kpTY/JUURPTnBGh2oTsUPqTU4LTUSb AIzpPQYxdkFpqTC/srO+rVXnE3W/lJ637z9WG1P3+3VpoJDX+wXzkQAn/zcvnJ/QkGwwew uiQLmCqJwylwS1l2iIQ0JKCm8i2rbrKBtDryR5Og3Nr46TPMreozWN3mxKxDKuyyna7Tgq Ump6GSHi3UVzIRWu9/byUm3df1eM7F4540qTFB87HQAVFXOjHhcUuzTYdGmfVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763193535; a=rsa-sha256; cv=none; b=ESkv6QYWNBEVFdKasbdKB8RtZpm7/XRjzS9pvQOCQi/kMPdo/CBHrhYGmZyh1SO/VepB+B 9ON4kRI6ldGtwcYUDAhU1Y7+AfTQ61q9nyUo0J9lWyTfq/OokCABbDakTsRYwMHyELiqWi tXIKf/YliWBaEB/VysSmTNTFytzoAGHhkpp6aFeP9fcKEaY0PmIf5O1JOOavycnCjIzLUN yaEjN9OB3AXgLAKs5d/8fX0VgqPzaAEKeEldyL/4cYXjRkkcPjl0In9KdGwdbJfm6GgIZ2 HFs3crhLkT7unCuLSV7q/Nr+0Ntl0qNLij5IlQJbYS+eBE9zO0cRkLm2srxfkQ== 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 4d7mby6dfpzjyV; Sat, 15 Nov 2025 07:58:54 +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 5AF7wsfc013393; Sat, 15 Nov 2025 07:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF7wsnN013390; Sat, 15 Nov 2025 07:58:54 GMT (envelope-from git) Date: Sat, 15 Nov 2025 07:58:54 GMT Message-Id: <202511150758.5AF7wsnN013390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 6b0909f94099 - main - bsdinstall: Copy in all keys List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6b0909f94099f92992fbd58eee7ce0f9289cb05e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6b0909f94099f92992fbd58eee7ce0f9289cb05e commit 6b0909f94099f92992fbd58eee7ce0f9289cb05e Author: Colin Percival AuthorDate: 2025-11-14 05:28:23 +0000 Commit: Colin Percival CommitDate: 2025-11-15 07:58:40 +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 --- 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