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_iso | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts/build/binary_iso') diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index e81a13af1..d8b1553e4 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -107,8 +107,10 @@ then XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\"" fi +LB_PRIMARY_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }') + # Handle xorriso architecture specific options -case "${LB_BOOTLOADER}" in +case "${LB_PRIMARY_BOOTLOADER}" in grub) XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito" @@ -149,7 +151,7 @@ esac # XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}" #fi -if [ "${LB_BOOTLOADER}" = "grub-pc" ] +if [ "${LB_PRIMARY_BOOTLOADER}" = "grub-pc" ] then cat > binary.sh << EOF -- cgit v1.2.3