diff options
| author | Andrew Cady <d@jerkface.net> | 2017-03-28 16:07:09 -0400 |
|---|---|---|
| committer | Andrew Cady <d@jerkface.net> | 2017-03-28 16:12:28 -0400 |
| commit | 5160fd50cf2bf09700c20236cac992a7a85fc943 (patch) | |
| tree | c4bef4cc1b8a0635222cf83b4927f5fdcdedf635 /isolinux/pxelinux.cfg | |
| parent | 2a575328ac1432c21e0b983d2432f1f64dff0f96 (diff) | |
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.
Diffstat (limited to 'isolinux/pxelinux.cfg')
| -rw-r--r-- | isolinux/pxelinux.cfg/default | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 2 | label samizdat | 2 | label samizdat |
| 3 | linux linux/vmlinuz | 3 | linux linux/vmlinuz |
| 4 | initrd linux/initrd.img | 4 | initrd linux/initrd.img |
| 5 | append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp netkeys | 5 | ipappend 0x3 |
| 6 | append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 netkeys | ||