diff options
| author | Andrew Cady <d@jerkface.net> | 2018-06-10 11:01:27 -0400 |
|---|---|---|
| committer | Andrew Cady <d@jerkface.net> | 2018-06-13 17:13:52 -0400 |
| commit | 46a9eab9586c0f901e4bf0ac3c6a887a7cbb3270 (patch) | |
| tree | 4de74562836574858a5ba1d62786ba578f8a646c /src | |
| parent | 4eb0ac11229aba304fc584aef9413be04d6bbb1f (diff) | |
Update for newer versions of nbd-client
The kernel commandline syntax for `nbdroot=...` changed.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/grub-efi.sh | 2 | ||||
| -rwxr-xr-x | src/qemu.sh | 2 |
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 | ||
| 4 | linux_kernel_commandline='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp' | 4 | linux_kernel_commandline='boot=samizdat components quiet splash nbdroot=192.168.10.1/samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp' |
| 5 | 5 | ||
| 6 | grub_config() | 6 | grub_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 | |||
| 27 | initrd=${samizdat_isolinux_dir}/linux/initrd.img | 27 | initrd=${samizdat_isolinux_dir}/linux/initrd.img |
| 28 | kernel=${samizdat_isolinux_dir}/linux/vmlinuz | 28 | kernel=${samizdat_isolinux_dir}/linux/vmlinuz |
| 29 | kcmdline_CDROM='boot=samizdat components quiet splash' | 29 | kcmdline_CDROM='boot=samizdat components quiet splash' |
| 30 | kcmdline_CDROM_NET="${kcmdline_CDROM} nbdroot=192.168.10.1,${nbd_filename} nbddev=/dev/nbd0 ip=dhcp" | 30 | kcmdline_CDROM_NET="${kcmdline_CDROM} nbdroot=192.168.10.1/${nbd_filename} nbddev=/dev/nbd0 ip=dhcp" |
| 31 | kcmdline_NET="${kcmdline_CDROM_NET} netkeys" | 31 | kcmdline_NET="${kcmdline_CDROM_NET} netkeys" |
| 32 | 32 | ||
| 33 | MAC='52-54-00-12-34-56' | 33 | MAC='52-54-00-12-34-56' |