1 files changed, 50 insertions, 13 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 39c89ca..cdf73ef 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -27,16 +27,41 @@ ceil4()
   printf '%d\n' "$x"
 }
 
+kernel_commandline_has()
+{
+    local v="$1" c
+    read c < /proc/cmdline
+    for c in $c
+    do
+        case "$c" in
+            "$v"|"$v"=*) true; return;;
+        esac
+    done
+    false
+}
+
+netbooted()
+{
+    kernel_commandline_has BOOTIF
+}
+
 cdrom_has_rootfs()
 {
-    [ ! "$BOOTIF" ] || return
-    bootwait samizdat-cdrom
-    [ -d /cdrom/rootfs ]
+    if netbooted
+    then
+        false
+    else
+        bootwait samizdat-cdrom
+        [ -d /cdrom/rootfs ]
+    fi
 }
 
 losetup_layers()
 {
     if cdrom_has_rootfs; then
+        # TODO: This is some kind of shortcut or short circuit to find these
+        # files, that ought to be found through the grok-block system (i.e.,
+        # event-driven rather than polling).
         local fs fs_rw
         for fs in /cdrom/rootfs/*.btrfs; do
             fs_rw=/"${fs##*/}".rw
@@ -45,8 +70,11 @@ losetup_layers()
         done
     else
         bootwait samizdat-nbd-dev
-        dd if=/dev/zero of=/nbd0.rw bs=1M count=10
-        dm_snapshot /dev/nbd0 /nbd0.rw
+        local dev
+        for dev in nbd0 nbd1; do
+            dd if=/dev/zero of=/$dev.rw bs=1M count=10
+            dm_snapshot /dev/$dev /$dev.rw
+        done
         return
     fi
 }
@@ -210,15 +238,24 @@ filesystem_incomplete()
 
 partition_new_hard_drive_DESTROYING_EVERYTHING()
 {
-    local target="$1"
+    # TODO: get the actual size of the btrfs master and actually triple it. The empty
+    # space can be left available to allow the local machine to boot a
+    # locally-regenerated rootfs seed.
+    sz=3
+    u=GiB
+    actual_sz=$sz$u
+    tripled_sz=$((sz * 3))$u
+    pct=100% # TODO: use 50%
+
+    local target="$1" sz=6GiB
     # [ "$(parted -sm "$target" print | grep -c :)"  = 1 ] || return
-    parted "$target" -sm                                        \
-           unit B                                               \
-           mklabel gpt                                          \
-           mkpart samizdat-grub-incomplete 32KiB 8160KiB        \
-           set 1 bios_grub on                                   \
-           mkpart samizdat-plaintext-incomplete btrfs 8MiB 1GiB \
-           mkpart samizdat-luks-encrypted-incomplete 1GiB 100%  \
+    parted "$target" -sm                                                     \
+           unit B                                                            \
+           mklabel gpt                                                       \
+           mkpart samizdat-grub-incomplete 32KiB 8MiB                        \
+           set 1 bios_grub on                                                \
+           mkpart samizdat-plaintext-incomplete btrfs 64MiB $actual_sz       \
+           mkpart samizdat-luks-encrypted-incomplete $tripled_sz $pct        \
         &&
         udevadm settle
 }