diff options
author | Andrew Cady <d@jerkface.net> | 2016-05-01 03:48:21 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2016-05-01 03:48:21 -0400 |
commit | 2b2ccb74093416c0ffac4d18c350d29a81d91fd8 (patch) | |
tree | d81bed4f8683616d4e9176c33743bca0eed34b8b /src/initrd/btrfs-create.sh | |
parent | 0adfdfe0d7d4350419d58d3bd0ec39c060de7a61 (diff) |
get GNUPGHOME from the network-downloaded .tar instead of the cdrom
(if available)
Diffstat (limited to 'src/initrd/btrfs-create.sh')
-rw-r--r-- | src/initrd/btrfs-create.sh | 7 |
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() | |||
264 | 264 | ||
265 | init_gpg() | 265 | init_gpg() |
266 | { | 266 | { |
267 | bootwait samizdat-cdrom | ||
268 | export GNUPGHOME=/gpg/gnupghome | 267 | export GNUPGHOME=/gpg/gnupghome |
269 | mkdir -p "$GNUPGHOME" | 268 | mkdir -p "$GNUPGHOME" |
269 | if [ -e /gnupghome.tar ]; then | ||
270 | tar -C "$GNUPGHOME" -zxf /gnupghome.tar | ||
271 | return | ||
272 | fi | ||
273 | |||
274 | bootwait samizdat-cdrom | ||
270 | (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME") | 275 | (umask 077; rsync --exclude '/luks-key*' --ignore-existing -rpP /cdrom/gnupghome/ "$GNUPGHOME") |
271 | 276 | ||
272 | if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then | 277 | if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then |