From 72a87fb70d26153bdfe06d0cdf42a199ff7ad68d Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 12 Mar 2020 06:37:53 +0000 Subject: [PATCH] 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. --- functions/defaults.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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