diff options
| author | James Simpson <james.simpson@canonical.com> | 2022-11-12 17:34:50 +0800 |
|---|---|---|
| committer | jsimpso <james.simpson@canonical.com> | 2022-11-12 17:34:50 +0800 |
| commit | 2ade1d9e66d8a31f49bbd3dfe5291b7671728c8f (patch) | |
| tree | 280a9a8bc58bf50fbf9761ed6a14444aa3256d25 | |
| parent | 2569433ef680632940e31a1b3c2fe070d449e11b (diff) | |
| download | vyos-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`.
| -rw-r--r-- | data/architectures/arm64.toml | 1 | ||||
| -rw-r--r-- | data/defaults.toml | 1 | ||||
| -rwxr-xr-x | scripts/build-vyos-image | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index fbd30008..8ba3805a 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -1,2 +1,3 @@ # Packages included in ARM64 images by default packages = ["grub-efi-arm"] +bootloaders = "grub-efi"
\ No newline at end of file diff --git a/data/defaults.toml b/data/defaults.toml index 9f0a2dcc..5b5c294c 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -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" 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 \ |