1 files changed, 29 insertions, 11 deletions

diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 86ff499..ee23b38 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -167,18 +167,29 @@ grok_block()
       # Avoid mouting this multiple times in case this script gets called multiple times,
       # because while it's mounted, the dmsetup stuff will fail with device busy.
     /dev/nbd0)
-      if [ -e /bootwait/samizdat-nbd-dev ]
-        then
-            return
-        else
-            bootwait nbd-script
-            wait_for_files_ /sys/block/nbd0/pid
-      fi
+        bootdone nbd0-dev
+        return ;;
+    /dev/nbd1)
+        bootwait nbd-script nbd0-dev
+        wait_for_files_ /sys/block/nbd0/pid /sys/block/nbd1/pid
     ;;
   esac
   case "$ID_PART_ENTRY_NAME" in
       samizdat-grub-incomplete|samizdat-plaintext-incomplete|samizdat-luks-encrypted-incomplete) return ;;
-      samizdat-grub|samizdat-luks-encrypted) 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
+          return
+          ;;
+      samizdat-grub) return ;;
+      samizdat-luks-encrypted)
+          menu-select boot-native "$(parent_device "$DEVNAME")"
+          return
+          ;;
   esac
 
   if [ "$ID_FS_TYPE" = hfsplus ] && ! fsck.hfsplus -q "$DEVNAME"; then
@@ -191,7 +202,11 @@ grok_block()
   fi
 
   if ! mountpoint -q "$mountpoint"; then
-    retry_mount $mount_type -o ro "$DEVNAME" "$mountpoint"
+    if [ "$DEVNAME" = /dev/nbd1 ]
+    then OPTIONS='-o device=/dev/nbd0'
+    else OPTIONS=
+    fi
+    retry_mount $mount_type -r $OPTIONS "$DEVNAME" "$mountpoint"
   fi
 
   if ! mountpoint -q "$mountpoint"; then
@@ -206,10 +221,13 @@ grok_block()
   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")"
+      umount "$mountpoint"
+      bootdone key-mounted
+    else
+      umount "$mountpoint"
     fi
-    umount "$mountpoint"
 
-  elif [ "$DEVNAME" = /dev/nbd0 ]; then
+  elif [ "$DEVNAME" = /dev/nbd1 ]; then
     # This is our rootfs, over the network
     umount "$mountpoint"
     rmdir "$mountpoint"