summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-08-19 22:12:33 +0200
committerErich Eckner <git@eckner.net>2022-12-08 12:57:22 +0100
commitc4555688668a8d7a729661d24c361ba3f32198ea (patch)
tree191b8cc4dee979143dc6a3afc51b003eb5fc1755
parentd6ed97bfe11b4ba807060e061c1907bd9a52f62e (diff)
downloaddevtools-c4555688668a8d7a729661d24c361ba3f32198ea.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--src/makechrootpkg.in3
-rw-r--r--src/mkarchroot.in2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/makechrootpkg.in b/src/makechrootpkg.in
index 737edda..e56e912 100644
--- a/src/makechrootpkg.in
+++ b/src/makechrootpkg.in
@@ -206,6 +206,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/src/mkarchroot.in b/src/mkarchroot.in
index 6101425..5fac505 100644
--- a/src/mkarchroot.in
+++ b/src/mkarchroot.in
@@ -91,6 +91,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