diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-12 06:37:53 +0000 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2020-03-12 10:33:13 +0000 |
| commit | 72a87fb70d26153bdfe06d0cdf42a199ff7ad68d (patch) | |
| tree | 575d4c7a4420c31301a6f118e571874da3bc95df /functions | |
| parent | 1e0339a4e36f85f468ecbdc21c645541f51e5e56 (diff) | |
| download | vyos-live-build-72a87fb70d26153bdfe06d0cdf42a199ff7ad68d.tar.gz vyos-live-build-72a87fb70d26153bdfe06d0cdf42a199ff7ad68d.zip | |
fix error for default hdd|netboot images
commit f811656150ff5f78e55b21702688f082330f78bd enabled the grub-efi
bootloader by default for amd64|i386 architectures, but failed to
recognise the this bootloader is not supported for hdd|netboot images.
this meants that if a user tried to build such an image without explicitly
specifying the bootloader, excluding grub-efi, their build would fail
with an error in the binary_grub-efi stage.
this fixes the problem by only enabling grub-efi by default on supported
image builds.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index bfbffa37e..695195d9d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -522,7 +522,14 @@ Set_config_defaults () then case "${LB_ARCHITECTURES}" in amd64|i386) - LB_BOOTLOADERS="syslinux,grub-efi" + case "${LIVE_IMAGE_TYPE}" in + hdd*|netboot) + LB_BOOTLOADERS="syslinux" + ;; + *) + LB_BOOTLOADERS="syslinux,grub-efi" + ;; + esac ;; esac fi |