From 39e4d3e3cbcc8d37700cfe46a95f669b4d9479ea Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 28 Mar 2020 05:13:11 +0000 Subject: --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 --- scripts/build/binary_disk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'scripts/build/binary_disk') diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index a2bdf9ad9..0e56eb8ef 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -21,13 +21,9 @@ USAGE="${PROGRAM} [--force]" # Processing arguments and configuration files Init_config_data "${@}" -case "${LIVE_IMAGE_TYPE}" in - iso*|hdd*) - ;; - *) - exit 0 - ;; -esac +if ! In_list "${LIVE_IMAGE_TYPE}" iso iso-hybrid hdd; then + exit 0 +fi Echo_message "Begin installing disk information..." -- cgit v1.2.3