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 /functions | |
| 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 'functions')
| -rwxr-xr-x | functions/defaults.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index eba52ae28..a0cb96899 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -536,11 +536,11 @@ Set_defaults () esac # Setting bootloader - if [ -z "${LB_BOOTLOADER}" ] + if [ -z "${LB_BOOTLOADERS}" ] then case "${LB_ARCHITECTURES}" in amd64|i386) - LB_BOOTLOADER="syslinux" + LB_BOOTLOADERS="syslinux" ;; esac fi @@ -853,7 +853,10 @@ Check_defaults () fi fi - if [ "${LB_BOOTLOADER}" = "syslinux" ] + + LB_PRIMARY_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }') + + if [ "${LB_PRIMARY_BOOTLOADER}" = "syslinux" ] then # syslinux + fat or ntfs, or extlinux + ext[234] or btrfs case "${LB_BINARY_FILESYSTEM}" in @@ -867,7 +870,7 @@ Check_defaults () case "${LIVE_IMAGE_TYPE}" in hdd*) - case "${LB_BOOTLOADER}" in + case "${LB_PRIMARY_BOOTLOADER}" in grub) Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type." exit 1 |