vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T4796: Allow configuration of 'bootloader' param

Browse Source 
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`.
This commit is contained in:
James Simpson 2022-11-12 17:34:50 +08:00 committed by jsimpso
parent 2569433ef6
commit 2ade1d9e66
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/architectures/arm64.toml
View File

@ -1,2 +1,3 @@
# Packages included in ARM64 images by default
packages = ["grub-efi-arm"]
bootloaders = "grub-efi"

1
data/defaults.toml
View File

@ -13,6 +13,7 @@ vyos_branch = "current"
release_train = "current"
kernel_version = "5.15.78"
bootloaders = "syslinux,grub-efi"
website_url = "https://vyos.io"
support_url = "https://support.vyos.io"

2
scripts/build-vyos-image
View File

@ -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 \