summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJames Simpson <james.simpson@canonical.com>2022-11-12 17:34:50 +0800
committerjsimpso <james.simpson@canonical.com>2022-11-12 17:34:50 +0800
commit2ade1d9e66d8a31f49bbd3dfe5291b7671728c8f (patch)
tree280a9a8bc58bf50fbf9761ed6a14444aa3256d25 /scripts
parent2569433ef680632940e31a1b3c2fe070d449e11b (diff)
downloadvyos-build-2ade1d9e66d8a31f49bbd3dfe5291b7671728c8f.tar.gz
vyos-build-2ade1d9e66d8a31f49bbd3dfe5291b7671728c8f.zip
T4796: Allow configuration of 'bootloader' param
Remove hard-coded values for "bootloader" when creating the live-build, replaced with the value of `bootloaders`. Set the current value to the default value if not specified, via `defaults.toml`. Add the default for arm64 as `grub-efi`.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-vyos-image2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image
index baabc7fe..74993145 100755
--- a/scripts/build-vyos-image
+++ b/scripts/build-vyos-image
@@ -426,7 +426,7 @@ if __name__ == "__main__":
--bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0" \
--linux-flavours {{kernel_flavor}} \
--linux-packages linux-image-{{kernel_version}} \
- --bootloader syslinux,grub-efi \
+ --bootloader {{ bootloaders }} \
--binary-images iso-hybrid \
--checksums 'sha256 md5' \
--debian-installer none \