summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2018-06-10 11:01:27 -0400
committerAndrew Cady <d@jerkface.net>2018-06-13 17:13:52 -0400
commit46a9eab9586c0f901e4bf0ac3c6a887a7cbb3270 (patch)
tree4de74562836574858a5ba1d62786ba578f8a646c /src
parent4eb0ac11229aba304fc584aef9413be04d6bbb1f (diff)
Update for newer versions of nbd-client
The kernel commandline syntax for `nbdroot=...` changed.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/grub-efi.sh2
-rwxr-xr-xsrc/qemu.sh2
2 files changed, 2 insertions, 2 deletions
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 @@
1#!/bin/bash 1#!/bin/bash
2. samizdat-paths.sh 2. samizdat-paths.sh
3 3
4linux_kernel_commandline='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp' 4linux_kernel_commandline='boot=samizdat components quiet splash nbdroot=192.168.10.1/samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
5 5
6grub_config() 6grub_config()
7{ 7{
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
27initrd=${samizdat_isolinux_dir}/linux/initrd.img 27initrd=${samizdat_isolinux_dir}/linux/initrd.img
28kernel=${samizdat_isolinux_dir}/linux/vmlinuz 28kernel=${samizdat_isolinux_dir}/linux/vmlinuz
29kcmdline_CDROM='boot=samizdat components quiet splash' 29kcmdline_CDROM='boot=samizdat components quiet splash'
30kcmdline_CDROM_NET="${kcmdline_CDROM} nbdroot=192.168.10.1,${nbd_filename} nbddev=/dev/nbd0 ip=dhcp" 30kcmdline_CDROM_NET="${kcmdline_CDROM} nbdroot=192.168.10.1/${nbd_filename} nbddev=/dev/nbd0 ip=dhcp"
31kcmdline_NET="${kcmdline_CDROM_NET} netkeys" 31kcmdline_NET="${kcmdline_CDROM_NET} netkeys"
32 32
33MAC='52-54-00-12-34-56' 33MAC='52-54-00-12-34-56'