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

This commit is contained in:

Colin Percival

2025-11-13 21:28:23 -08:00

parent 70e73c43a4

commit 6b0909f940

1 changed files with 1 additions and 1 deletions

usr.sbin/bsdinstall/scripts/pkgbase.in

+1 -1

View File

@@ -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