diff options
| author | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2015-08-21 23:54:46 +0200 |
|---|---|---|
| committer | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2015-08-29 23:56:41 +0200 |
| commit | d515ae56842f9420ff4c629eac18904f7beef2e8 (patch) | |
| tree | 54303ab985d71ee280562b7ed75413c56a63ee93 /scripts/build/binary_iso | |
| parent | d43874c405ca468fc72158da6280c6b11755a3e6 (diff) | |
| download | vyos-live-build-d515ae56842f9420ff4c629eac18904f7beef2e8.tar.gz vyos-live-build-d515ae56842f9420ff4c629eac18904f7beef2e8.zip | |
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.
Diffstat (limited to 'scripts/build/binary_iso')
| -rwxr-xr-x | scripts/build/binary_iso | 6 |
1 files changed, 4 insertions, 2 deletions
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 |