Update for newer versions of nbd-client

The kernel commandline syntax for `nbdroot=...` changed.

4 files changed, 4 insertions, 4 deletions

diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index a42b321..1e333f4 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -40,7 +40,7 @@ keys_via_network()
     for arg in $cmdline; do
         case "$arg" in
             netkeys)
-                tftp_key_server="${nbdroot%%,*}"
+                tftp_key_server="${nbdroot%%/*}"
                 return 0
             ;;
             netkeys=*)
diff --git a/isolinux/pxelinux.cfg/default b/isolinux/pxelinux.cfg/default
index 4dc57fc..738769e 100644
--- a/isolinux/pxelinux.cfg/default
+++ b/isolinux/pxelinux.cfg/default
@@ -3,4 +3,4 @@ label samizdat
         linux linux/vmlinuz
         initrd linux/initrd.img
   ipappend 0x3
-        append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 netkeys
+        append boot=samizdat components quiet splash nbdroot=192.168.10.1/samizdat.btrfs nbddev=/dev/nbd0 netkeys
diff --git a/src/grub-efi.sh b/src/grub-efi.sh
index 44b9dec..f0866ac 100755
--- a/src/grub-efi.sh
+++ b/src/grub-efi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 . samizdat-paths.sh
 
-linux_kernel_commandline='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
+linux_kernel_commandline='boot=samizdat components quiet splash nbdroot=192.168.10.1/samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
 
 grub_config()
 {
diff --git a/src/qemu.sh b/src/qemu.sh
index de431f5..11de8e7 100755
--- a/src/qemu.sh
+++ b/src/qemu.sh
@@ -27,7 +27,7 @@ nbd_filename=samizdat.btrfs
 initrd=${samizdat_isolinux_dir}/linux/initrd.img
 kernel=${samizdat_isolinux_dir}/linux/vmlinuz
 kcmdline_CDROM='boot=samizdat components quiet splash'
-kcmdline_CDROM_NET="${kcmdline_CDROM} nbdroot=192.168.10.1,${nbd_filename} nbddev=/dev/nbd0 ip=dhcp"
+kcmdline_CDROM_NET="${kcmdline_CDROM} nbdroot=192.168.10.1/${nbd_filename} nbddev=/dev/nbd0 ip=dhcp"
 kcmdline_NET="${kcmdline_CDROM_NET} netkeys"
 
 MAC='52-54-00-12-34-56'