Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-08-19 22:12:33 +0200
committerErich Eckner <git@eckner.net>2019-10-16 06:26:55 +0200
commit18c9ca1e109a1e34d7f57466ecffe76089d38ff5 (patch)
treef4a0a0effc08e60e026a51bd751d8d2e937df9cb
parent2ef316137656572501f202cc2ff49666beb4c918 (diff)
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.in3
-rw-r--r--mkarchroot.in2
2 files changed, 5 insertions, 0 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 004b99b..8ed112f 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -227,6 +227,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 a0cacac..aafaa4f 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -95,6 +95,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