Use pxelinux "ipappend" option to choose rootfs source

This fixes the issue described in the first 'netkeys' commit, where the
network would need to be available even when it was not used.

The "ipappend" option results in a $BOOTIF variable in the initrd
environment.  This variable is now used to determine whether to wait on
the network for a rootfs & keys, or to wait on the boot device becoming
available to determine whether it has the keys.

That is, there may or may not be a boot device which may or may not
have keys and/or rootfs, but we will always know for sure whether
it does, therefore there are no races and no waiting on the network
unnecessarily.

The qemu.sh script was updated to provide the BOOTIF variable when PXE
boot is emulated.

5 files changed, 47 insertions, 22 deletions

diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 515b724..a42b321 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -8,20 +8,29 @@ mountroot()
   samizdat_install_udev_rules
 
   if [ "${nbdroot%%,*}" ]; then
-    # I guess this isn't getting called otherwise? I don't know why this should
-    # be necessary, but it is.
-    sh /scripts/local-top/nbd >/dev/null 2>&1
+      (. common.sh
+       sh /scripts/local-top/nbd >/dev/null 2>&1;
+       bootdone nbd-script) &
   fi
 
-  if keys_via_network; then
-    wait_for_gnupghome_tar "$tftp_key_server"
+  if ! cdrom_has_keys && keys_via_network; then
+      bootwait nbd-script
+      wait_for_gnupghome_tar "$tftp_key_server"
   fi
+
   bootwait samizdat-gpg
   bootmenu
   bootwait root-mounted
   chvt 1
 }
 
+cdrom_has_keys()
+{
+    [ ! "$BOOTIF" ] || return
+    bootwait samizdat-cdrom
+    [ -d /cdrom/gnupghome ]
+}
+
 # Sets $tftp_key_server or returns false.
 keys_via_network()
 {
diff --git a/isolinux/pxelinux.cfg/default b/isolinux/pxelinux.cfg/default
index 77796b3..4dc57fc 100644
--- a/isolinux/pxelinux.cfg/default
+++ b/isolinux/pxelinux.cfg/default
@@ -2,4 +2,5 @@ default samizdat
 label samizdat
         linux linux/vmlinuz
         initrd linux/initrd.img
-        append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp netkeys
+  ipappend 0x3
+        append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 netkeys
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
diff --git a/src/qemu.sh b/src/qemu.sh
index b095eb8..3b8cdec 100755
--- a/src/qemu.sh
+++ b/src/qemu.sh
@@ -12,6 +12,8 @@ layered=${samizdat_iso_dir}/${iso%.iso}.layered.iso
 
 initrd.sh || { echo "initrd.sh failed" >&2; exit 1; };
 
+[ "$NO_NET" ] || USE_NET=y
+
 NET='tap,vlan=0,ifname=tap0,script=no,downscript=no'
 
 [ "$SLOW_BOOT" ] || QEMU_LOADS_LINUX=y
@@ -21,9 +23,13 @@ NET='tap,vlan=0,ifname=tap0,script=no,downscript=no'
 
 initrd=${samizdat_isolinux_dir}/linux/initrd.img
 kernel=${samizdat_isolinux_dir}/linux/vmlinuz
-      kcmdline_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp netkeys'
-kcmdline_CDROM_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
 kcmdline_CDROM='boot=samizdat components quiet splash'
+kcmdline_CDROM_NET="${kcmdline_CDROM} nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp"
+kcmdline_NET="${kcmdline_CDROM_NET} netkeys"
+
+MAC='52-54-00-12-34-56'
+
+kcmdline_BOOTIF="BOOTIF=01-$MAC"
 
 set --
 if [ "$USE_ISO" ]; then
@@ -40,7 +46,7 @@ if [ "$USE_ISO" ]; then
     fi
 else
     if [ "$QEMU_LOADS_LINUX" ]; then
-        set -- "$@" -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_NET"
+        set -- "$@" -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_NET $kcmdline_BOOTIF"
     else
         set -- "$@" -boot n
     fi
@@ -49,8 +55,8 @@ fi
 set -x
 sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \
      -vga qxl \
-     -net nic,vlan=0,model=virtio \
-     -net "$NET" \
+     -net nic,vlan=0,model=virtio,macaddr=$MAC \
+     ${USE_NET:+ -net "$NET"} \
      -rtc base=localtime \
      -hda "$disk" \
      "$@"