2 files changed, 11 insertions, 2 deletions

diff --git a/initramfs-tools/modules b/initramfs-tools/modules
index dd9dc54..ee049de 100644
--- a/initramfs-tools/modules
+++ b/initramfs-tools/modules
@@ -9,3 +9,5 @@
 #
 # raid1
 # sd_mod
+
+btrfs
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 1591883..0c511e8 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -6,10 +6,10 @@ mountroot()
 
   samizdat_install_udev_rules
   mkfifo "$MENUFIFO"
-  sh /scripts/local-top/nbd >/dev/null 2>&1 & # I guess this isn't getting called otherwise?
 
+  # Note: this blocks waiting for the network
   if [ "${nbdroot%%,*}" ]; then
-    wait_for_gnupghome_tar
+    try_nbd
   fi
 
   bootmenu
@@ -17,6 +17,13 @@ mountroot()
   chvt 1
 }
 
+try_nbd()
+{
+  sh /scripts/local-top/nbd >/dev/null 2>&1 & # I guess this isn't getting called otherwise?
+  wait_for_gnupghome_tar
+  (. common.sh && force_grok_block)
+}
+
 wait_for_gnupghome_tar()
 {
   [ -e /gnupghome.tar ] && return