diff options
author | Erich Eckner <git@eckner.net> | 2019-08-19 22:12:33 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2020-05-18 08:45:02 +0200 |
commit | 0fd4173f367994188b2d04e2534a882866449eb9 (patch) | |
tree | fcbef5b7e367fe6f3c14bdb3bc89db00e8ff67b7 | |
parent | 25fc755a82a114ede5bad4e40c1a9da43014dde4 (diff) | |
download | devtools-0fd4173f367994188b2d04e2534a882866449eb9.tar.xz |
makechrootpkg & mkarchroot: init and populate keyrings
We had trouble in the past with not properly initialized keyrings.
This change aims at fixing this.
-rw-r--r-- | makechrootpkg.in | 3 | ||||
-rw-r--r-- | mkarchroot.in | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 99534c4..866a075 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -209,6 +209,9 @@ _chrootbuild() { # shellcheck source=/dev/null . /etc/profile + # otherwise we might have missing keys + pacman-key --populate + # Beware, there are some stupid arbitrary rules on how you can # use "$" in arguments to commands with "sudo -i". ${foo} or # ${1} is OK, but $foo or $1 isn't. diff --git a/mkarchroot.in b/mkarchroot.in index fc5ded6..ecece06 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -100,6 +100,8 @@ echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" systemd-machine-id-setup --root="$working_dir" +pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg --init + exec arch-nspawn \ "${nspawn_args[@]}" \ "$working_dir" locale-gen |