get GNUPGHOME from the network-downloaded .tar instead of the cdrom

(if available)

1 files changed, 6 insertions, 1 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index d4a8bdf..fa8bbfb 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -264,9 +264,14 @@ get_cdrom_sizelimit()
 
 init_gpg()
 {
-  bootwait samizdat-cdrom
   export GNUPGHOME=/gpg/gnupghome
   mkdir -p "$GNUPGHOME"
+  if [ -e /gnupghome.tar ]; then
+      tar -C "$GNUPGHOME" -zxf /gnupghome.tar
+      return
+  fi
+
+  bootwait samizdat-cdrom
   (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
 
   if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then