From 3e440043f86601f586f2b3bf639abd301a6b176f Mon Sep 17 00:00:00 2001
From: Jon Erling Hustadnes <jonerling.hustadnes@gmail.com>
Date: Sat, 3 Feb 2024 20:43:17 +0100
Subject: [PATCH] Add wait for keyring initialization (#3)

* added check for keyring initialization
* update archlinux-keyring prior to pacstrap
---
 arch-install.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch-install.sh b/arch-install.sh
index c0a455d..287fbb2 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -169,6 +169,21 @@ case $STAGE in
 
         # }}}
         # pacstrap {{{
+            KEYRING_INITIALIZING="$(mktemp)"
+            echo "Waiting for arch-keyring to initialize"
+            for _ in {1..300}; do
+                systemctl show pacman-init.service | \
+                    grep -q 'SubState=exited' && \
+                    rm -f $KEYRING_INITIALIZING && \
+                    break
+                sleep 1
+            done
+            if [ -f $KEYRING_INITIALIZING ]; then
+                echo "Keyring did not initialize, aborting!"
+                exit 1
+            fi
+
+            yes | pacman -Sy archlinux-keyring
             pacstrap -K /mnt "${PACKAGES[@]}"
         # }}}
         # genfstab {{{