From 3f840aeeba982a858a881271a3bb48bca5b50dd8 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Mon, 4 May 2020 14:28:37 +0100
Subject: fully validate BIOS/EFI bootloader combinations

thus far, config bootloader validation only did the basic check that each
bootloader specified was a known and supported bootloader, it did not check
combinations.

it now checks combinations, and strips out the previous "bootloader role"
stuff.

the no-bootloaders warning is duplicated, covering two slightly different
situations (empty string, and whitespace string). this is anticipated to
be just temporary, with this just being the first step in better handling
bootloader selections.

Gbp-Dch: Short
---
 scripts/build/binary_grub-efi    | 6 ++++--
 scripts/build/binary_grub-legacy | 6 ++++--
 scripts/build/binary_grub-pc     | 6 ++++--
 scripts/build/binary_syslinux    | 4 +++-
 4 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi
index 6b4101e8f..2fec81d63 100755
--- a/scripts/build/binary_grub-efi
+++ b/scripts/build/binary_grub-efi
@@ -21,11 +21,13 @@ USAGE="${PROGRAM} [--force]"
 # Processing arguments and configuration files
 Init_config_data "${@}"
 
-if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
+if ! In_list "grub-efi" $LB_BOOTLOADERS; then
 	exit 0
 fi
 
-Check_Any_Bootloader_Role "grub-efi"
+if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
+	exit 0
+fi
 
 Echo_message "Begin preparing Grub based EFI support..."
 
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index 19b80e7bb..6399b8e5f 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -21,11 +21,13 @@ USAGE="${PROGRAM} [--force]"
 # Processing arguments and configuration files
 Init_config_data "${@}"
 
-if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
+if ! In_list "grub-legacy" $LB_BOOTLOADERS; then
 	exit 0
 fi
 
-Check_First_Bootloader_Role "grub-legacy"
+if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
+	exit 0
+fi
 
 Echo_message "Begin installing grub-legacy..."
 
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index cd385ead2..ac6fd04a1 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -21,11 +21,13 @@ USAGE="${PROGRAM} [--force]"
 # Processing arguments and configuration files
 Init_config_data "${@}"
 
-if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
+if ! In_list "grub-pc" $LB_BOOTLOADERS; then
 	exit 0
 fi
 
-Check_Any_Bootloader_Role "grub-pc"
+if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
+	exit 0
+fi
 
 Echo_message "Begin installing grub-pc..."
 
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index c4b985a41..2374d5c55 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -21,7 +21,9 @@ USAGE="${PROGRAM} [--force]"
 # Processing arguments and configuration files
 Init_config_data "${@}"
 
-Check_Any_Bootloader_Role "syslinux"
+if ! In_list "syslinux" $LB_BOOTLOADERS; then
+	exit 0
+fi
 
 Echo_message "Begin installing syslinux..."
 
-- 
cgit v1.2.3