summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2016-05-01 03:54:59 -0400
committerAndrew Cady <d@jerkface.net>2016-05-01 03:54:59 -0400
commited8aa1d9afea87924b84c639511e65e77a050b48 (patch)
tree8a68410647b01e68dbfeae8f4718f53be3b9bb78 /src
parent2b2ccb74093416c0ffac4d18c350d29a81d91fd8 (diff)
don't wait for the cdrom when all we need is the gpg homedir
Diffstat (limited to 'src')
-rw-r--r--src/initrd/btrfs-create.sh9
-rwxr-xr-xsrc/initrd/grok-block5
2 files changed, 8 insertions, 6 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()
267 export GNUPGHOME=/gpg/gnupghome 267 export GNUPGHOME=/gpg/gnupghome
268 mkdir -p "$GNUPGHOME" 268 mkdir -p "$GNUPGHOME"
269 if [ -e /gnupghome.tar ]; then 269 if [ -e /gnupghome.tar ]; then
270 tar -C "$GNUPGHOME" -zxf /gnupghome.tar 270 tar -C "$GNUPGHOME" -zxf /gnupghome.tar && bootdone samizdat-gpg
271 return 271 return
272 else
273 bootwait samizdat-cdrom
274 (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
275 bootdone samizdat-gpg
272 fi 276 fi
273 277
274 bootwait samizdat-cdrom
275 (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME")
276
277 if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then 278 if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then
278 clear 279 clear
279 true 280 true
diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 75d5120..e573c91 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -71,8 +71,9 @@ retry_mount()
71 71
72gpg_verify() 72gpg_verify()
73{ 73{
74 bootwait samizdat-cdrom 74 bootwait samizdat-gpg
75 gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --homedir /cdrom/gnupghome --verify "$1" 75 export GNUPGHOME=/gpg/gnupghome
76 gpg2 --lock-never --no-permission-warning --no-auto-check-trustdb --no-options --verify "$1"
76} 77}
77is_lvm() 78is_lvm()
78{ 79{