diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/architectures.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/functions/architectures.sh b/functions/architectures.sh index 76eb88e5f..747a78aa6 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -96,7 +96,7 @@ Check_multiarchitectures () if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ] then # First, only support multiarch on iso - case "${LB_BINARY_IMAGES}" in + case "${LIVE_IMAGE_TYPE}" in iso*) # Assemble multi-arch case "${LB_CURRENT_ARCHITECTURE}" in diff --git a/functions/defaults.sh b/functions/defaults.sh index 2500ddd59..f8606dd41 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -792,11 +792,11 @@ Set_defaults () # Setting image type case "${LB_ARCHITECTURES}" in amd64|i386) - LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso-hybrid}" + LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" ;; *) - LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso}" + LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso}" ;; esac @@ -901,7 +901,7 @@ Set_defaults () if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ] then - case "${LB_BINARY_IMAGES}" in + case "${LIVE_IMAGE_TYPE}" in iso*) _LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ;; @@ -1200,7 +1200,7 @@ Check_defaults () esac fi - case "${LB_BINARY_IMAGES}" in + case "${LIVE_IMAGE_TYPE}" in hdd*) # grub or yaboot + hdd case "${LB_BOOTLOADER}" in |