4 files changed, 15 insertions, 7 deletions
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..."