don't wait for the cdrom when all we need is the gpg homedir

1 files changed, 5 insertions, 4 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index fa8bbfb..8688560 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -267,13 +267,14 @@ init_gpg()
   export GNUPGHOME=/gpg/gnupghome
   mkdir -p "$GNUPGHOME"
   if [ -e /gnupghome.tar ]; then
-      tar -C "$GNUPGHOME" -zxf /gnupghome.tar
+      tar -C "$GNUPGHOME" -zxf /gnupghome.tar && bootdone samizdat-gpg
       return
+  else
+      bootwait samizdat-cdrom
+      (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
+      bootdone samizdat-gpg
   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
     clear
     true