netbooting, with unique keys, WORKS

3 files changed, 23 insertions, 3 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 8688560..edd2d1c 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+. loop-layer.sh
+. mdadm-dup.sh
+
 losetup() { /sbin/losetup "$@"; }
 
 luks_secret()
@@ -24,10 +27,15 @@ ceil4()
   printf '%d\n' "$x"
 }
 
-. loop-layer.sh
-
 losetup_layers()
 {
+    if netbooting; then
+        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
diff --git a/src/initrd/common.sh b/src/initrd/common.sh
index b91bbf9..1471e7c 100644
--- a/src/initrd/common.sh
+++ b/src/initrd/common.sh
@@ -52,6 +52,11 @@ bootmenu()
   fi
 }
 
+netbooting()
+{
+    [ "$nbdroot" ]
+}
+
 xtrace()
 {
   case "$-" in
diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 93770d5..4978a92 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -108,7 +108,14 @@ grok_block()
     retry_mount $mount_type -o ro "$DEVNAME" "$mountpoint"
   fi
 
-  if mountpoint -q "$mountpoint"; then
+  if [ "$DEVNAME" = /dev/nbd0 ] && mountpoint -q "$mountpoint"; then
+
+    # This is our rootfs, over the network
+    umount "$mountpoint"
+    rmdir "$mountpoint"
+    bootdone samizdat-nbd-dev
+
+  elif mountpoint -q "$mountpoint"; then
     umount=true
     # Device has an unencrypted filesystem on it.
     # So we mount it and look for loop-back overlays.