From 6b02875b91acf6914c0039840c004cfa57e67a58 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 19 Aug 2019 22:12:33 +0200
Subject: makechrootpkg & mkarchroot: init and populate keyrings

We had trouble in the past with not properly initialized keyrings.
This change aims at fixing this.
---
 makechrootpkg.in | 3 +++
 mkarchroot.in    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/makechrootpkg.in b/makechrootpkg.in
index c2d8cdd..4da2ff6 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
-- 
cgit v1.2.3-70-g09d2