diff options
| author | Daniil Baturin <daniil@vyos.io> | 2022-11-12 17:02:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 17:02:36 +0000 |
| commit | b55bf1b1c5de4d778371653b863179c9a0d5fe76 (patch) | |
| tree | 82536a035d9ff8564700fa0bb7d70853ed4146d0 | |
| parent | ff651097b1283cf75fa49dac133520d1049a0e98 (diff) | |
| parent | 2ade1d9e66d8a31f49bbd3dfe5291b7671728c8f (diff) | |
| download | vyos-build-b55bf1b1c5de4d778371653b863179c9a0d5fe76.tar.gz vyos-build-b55bf1b1c5de4d778371653b863179c9a0d5fe76.zip | |
Merge pull request #285 from jsimpso/bootloaders
T4796: Allow configuration of 'bootloader' param
| -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 4cf45134..f09791d9 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -425,7 +425,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 \ |