--binary-images can support only a single type

whilst some parts of the codebase were set up to work with multiple types
specified, others did not work with it and would not necessarily be easy
to adjust. this thus makes some tweaks to adjust things accordingly.

 - option renamed to singular form (maintaining backwards compatibility)
 - a validation check has been added
 - unnecessary glob style type references fixed
 - checks with In_list changed to a direct singular comparison
 - typo of type "netboot" written as just "net" fixed (though unreachable
   so of no consequence; really the code could be removed but it's trivial)

Gbp-Dch: Short

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index 462fd6286..4549d3b41 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -49,7 +49,7 @@ Install_package
 
 # Setting destination directory
 case "${LIVE_IMAGE_TYPE}" in
-	hdd*|netboot)
+	hdd|netboot)
 		Echo_warning "Bootloader in this image type not yet supported by live-build."
 		Echo_error "This would produce a not bootable image, aborting (FIXME)."
 		exit 1
@@ -60,11 +60,11 @@ esac
 mkdir -p binary/boot/grub/i386-pc
 
 case ${LIVE_IMAGE_TYPE} in
-	iso*)
+	iso|iso-hybrid)
 		FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
 		;;
 
-	hdd*|tar)
+	hdd|tar)
 		FILES="chroot/usr/lib/grub/i386-pc/*"
 		;;
 esac