From d515ae56842f9420ff4c629eac18904f7beef2e8 Mon Sep 17 00:00:00 2001 From: Adrian Gibanel Lopez Date: Fri, 21 Aug 2015 23:54:46 +0200 Subject: Multi bootloader support Note: OLDIFS use makes IFS to be reset to "" instead to it being unset. Either we need to detect if old IFS was unset to unset it or we need a proper way of setting it as a local variable. Even more IFS it's not currently used in Check_package (which it's called from: binary_hdd). we should have a clean way of resetting/unsetting IFS when calling Check_package. The other approach it's to explicitly define IFS with its default value in the places inside live-build code where we implicitly suppose that it's going to have its default value. --- scripts/build/binary_syslinux | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'scripts/build/binary_syslinux') diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 41d7feccb..024b56358 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -24,9 +24,23 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LB_BOOTLOADER}" != "syslinux" ] -then - exit 0 +FOUND_MYSELF="" +OLDIFS="$IFS" +IFS="," +for BOOTLOADER in ${LB_BOOTLOADERS} +do + + case ${BOOTLOADER} in + "syslinux" ) + FOUND_MYSELF="True" + break ;; + esac + +done +IFS="$OLDIFS" + +if [ -z ${FOUND_MYSELF} ] ; then + exit 0 fi Echo_message "Begin installing syslinux..." -- cgit v1.2.3