diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2025-11-14 05:28:23 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2025-11-15 07:58:40 +0000 |
| commit | 6b0909f94099f92992fbd58eee7ce0f9289cb05e (patch) | |
| tree | af096925c64003d2d21b6df5d3bef17f3c651e7d | |
| parent | 70e73c43a472e260e8f4b27b65a760643dee85dc (diff) | |
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
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/pkgbase.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 |