about to reboot and try this shit

1 files changed, 11 insertions, 6 deletions

diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index ee23b38..0b5f3f9 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -177,14 +177,15 @@ grok_block()
   case "$ID_PART_ENTRY_NAME" in
       samizdat-grub-incomplete|samizdat-plaintext-incomplete|samizdat-luks-encrypted-incomplete) return ;;
       samizdat-plaintext)
-          . /verity.sh
-          cp /verity.sh /run/initramfs/samizdat/
-          veritysetup --hash-offset="$verity_hash_offset" \
-                      create samizverity \
-                      "$DEVNAME" "$DEVNAME" "$verity_root_hash"
-          bootdone veritysetup
+          # . /verity.sh
+          # cp /verity.sh /run/initramfs/samizdat/
+          # veritysetup --hash-offset="$verity_hash_offset" \
+          #             create samizverity \
+          #             "$DEVNAME" "$DEVNAME" "$verity_root_hash"
+          # bootdone veritysetup
           return
           ;;
+      samizdat-keys) ;;
       samizdat-grub) return ;;
       samizdat-luks-encrypted)
           menu-select boot-native "$(parent_device "$DEVNAME")"
@@ -218,6 +219,10 @@ grok_block()
       # TODO: Need option to boot the partitions we create
       # TODO: And what if we create partitions and then reboot the machine mid-install?
 
+  elif [ "$ID_PART_ENTRY_NAME" = samizdat-keys ]; then
+      mkdir -p /gpg
+      cp -a "$mountpoint"/gnupghome /gpg/ && bootdone samizdat-gpg && bootdone samizdat-cdrom
+
   elif [ "$ID_PART_ENTRY_NAME" = samizdat-plaintext ]; then
     if gpg_verify "$mountpoint"/disk.key && gpg_can_decrypt "$mountpoint"/disk.key; then
       addmenu_choose_native_root "$(parent_device "$DEVNAME")"