4 files changed, 14 insertions, 2 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index 5ec8688..78ece68 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -10,7 +10,7 @@ PATH=/usr/local/bin:$PATH
 
 repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
 
-path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent'
+path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files samizdat-pinentry dynmenu samizdat-password-agent samizdat-gpg-agent'
 
 graft_paths="
     /bin/OpenVT=/bin/openvt
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 &
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index 0d7773d..e912080 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -160,11 +160,16 @@ if [ "$INPUT_DEVICE" ]; then
         REMOVE_BTRFS=
         ADD_BTRFS=
     fi
+elif [ "$BOOTLOADER_ONLY" ]; then
+    REPLACE_INITRD=
+    REMOVE_BTRFS=
+    ADD_BTRFS=
 else
     REPLACE_INITRD=y
     REMOVE_BTRFS=y
     ADD_BTRFS=y
 fi
+REPLACE_INITRD= # TODO: fix initrd replacing
 
 if [ "$QUICK_TEST" ]; then
     REMOVE_BTRFS=y
@@ -200,6 +205,7 @@ xorriso \
         \
         \
         ${REPLACE_INITRD:+ -rm_r linux -- -add linux="${vmlinuz_dir}" -- } \
+        ${BOOTLOADER_ONLY:+ -add linux="${vmlinuz_dir}" -- } \
         ${REMOVE_BTRFS:+   -rm_r rootfs -- } \
         ${ADD_BTRFS:+      -follow link -add "$@" -- -follow default } \
         \