diff options
| author | Erich Eckner <git@eckner.net> | 2019-08-19 22:12:33 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-02-19 09:39:54 +0100 |
| commit | 418d24eebbf9e6a7715a1abf602c0cbfff4dfba9 (patch) | |
| tree | 02b0ad2282db43bb544fe78f41839d580f7a5886 | |
| parent | 0fe31dd8395c5b6769839c60a11d135ecc408270 (diff) | |
| download | devtools32-418d24eebbf9e6a7715a1abf602c0cbfff4dfba9.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 3fc0262..e8335ce 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -212,6 +212,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 |