From ec4837a57a137672033d326770b2d978764c1841 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 3 May 2016 10:13:42 -0400 Subject: fix the rest of the bugs --- src/initrd/btrfs-create.sh | 2 +- src/initrd/grok-block | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/initrd') diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh index 6a6a94e..c13d981 100644 --- a/src/initrd/btrfs-create.sh +++ b/src/initrd/btrfs-create.sh @@ -120,7 +120,7 @@ initialize_root_filesystem() rmdir /root/home btrfs subvolume create /root/home || return - copy_execs sbin mdadm dmsetup cryptsetup + copy_execs sbin mdadm dmsetup cryptsetup fsck.hfsplus copy_execs bin btrfs rsync gpg gpg2 gpg-agent # Copy these over unconditionally, because they ought to remain in sync with diff --git a/src/initrd/grok-block b/src/initrd/grok-block index 4978a92..081238a 100755 --- a/src/initrd/grok-block +++ b/src/initrd/grok-block @@ -184,6 +184,12 @@ then mkdir -p /cdrom . mdadm-dup.sh dup_mount_cdrom "$DEVNAME" /cdrom && bootdone samizdat-cdrom + if [ -e /cdrom/gnupghome ]; then + # TODO: don't use first match + mkdir -p /gpg/gnupghome + cp /cdrom/gnupghome/* /gpg/gnupghome + bootdone samizdat-gpg + fi fi else grok_block & -- cgit v1.2.3