From ed8aa1d9afea87924b84c639511e65e77a050b48 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sun, 1 May 2016 03:54:59 -0400 Subject: don't wait for the cdrom when all we need is the gpg homedir --- src/initrd/btrfs-create.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/initrd/btrfs-create.sh') 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 -- cgit v1.2.3