diff options
-rw-r--r-- | initramfs-tools/scripts/samizdat | 2 | ||||
-rw-r--r-- | isolinux/pxelinux.cfg/default | 2 | ||||
-rwxr-xr-x | src/grub-efi.sh | 2 | ||||
-rwxr-xr-x | src/qemu.sh | 2 |
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() | |||
40 | for arg in $cmdline; do | 40 | for arg in $cmdline; do |
41 | case "$arg" in | 41 | case "$arg" in |
42 | netkeys) | 42 | netkeys) |
43 | tftp_key_server="${nbdroot%%,*}" | 43 | tftp_key_server="${nbdroot%%/*}" |
44 | return 0 | 44 | return 0 |
45 | ;; | 45 | ;; |
46 | netkeys=*) | 46 | 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 | |||
3 | linux linux/vmlinuz | 3 | linux linux/vmlinuz |
4 | initrd linux/initrd.img | 4 | initrd linux/initrd.img |
5 | ipappend 0x3 | 5 | ipappend 0x3 |
6 | append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 netkeys | 6 | 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 @@ | |||
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' |