2 files changed, 20 insertions, 11 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index a1a53ed..8a0cd87 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -27,22 +27,28 @@ ceil4()
   printf '%d\n' "$x"
 }
 
+cdrom_has_rootfs()
+{
+    [ ! "$BOOTIF" ] || return
+    bootwait samizdat-cdrom
+    [ -d /cdrom/rootfs ]
+}
+
 losetup_layers()
 {
-    if netbooting; then
+    if cdrom_has_rootfs; then
+        local fs fs_rw
+        for fs in /cdrom/rootfs/*.btrfs; do
+            fs_rw=/"${fs##*/}".rw
+            dd if=/dev/zero of="$fs_rw" bs=1M count=10
+            losetup_snapshot "$fs" "$fs_rw" || return
+        done
+    else
         bootwait samizdat-nbd-dev
         dd if=/dev/zero of=/nbd0.rw bs=1M count=10
         dm_snapshot /dev/nbd0 /nbd0.rw
         return
     fi
-
-    bootwait samizdat-cdrom
-    local fs fs_rw
-    for fs in /cdrom/rootfs/*.btrfs; do
-        fs_rw=/"${fs##*/}".rw
-        dd if=/dev/zero of="$fs_rw" bs=1M count=10
-        losetup_snapshot "$fs" "$fs_rw" || return
-    done
 }
 
 init_samizdat()
diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 3ad0432..f44ed19 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -150,8 +150,11 @@ grok_block()
       # because while it's mounted, the dmsetup stuff will fail with device busy.
     /dev/nbd0)
       if [ -e /bootwait/samizdat-nbd-dev ]
-        then return
-        else wait_for_files_ /sys/block/nbd0/pid
+        then
+            return
+        else
+            bootwait nbd-script
+            wait_for_files_ /sys/block/nbd0/pid
       fi
     ;;
   esac