summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_linuximage
diff options
context:
space:
mode:
Diffstat (limited to 'helpers/lh_binary_linuximage')
-rwxr-xr-xhelpers/lh_binary_linuximage20
1 files changed, 12 insertions, 8 deletions
diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage
index bcdddc14a..600aeaa81 100755
--- a/helpers/lh_binary_linuximage
+++ b/helpers/lh_binary_linuximage
@@ -36,15 +36,15 @@ Breakpoint "binary_linuximage: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_linuximage
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_linuximage
-
# Removing initrd backup files
rm -f chroot/boot/initrd*bak*
@@ -66,11 +66,15 @@ esac
# Temporary check for broken syslinux
if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
- esac
+ # Assemble multi-arch
+ if [ -n "${MULTIARCH}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ i386)
+ DESTDIR="${DESTDIR}.386"
+ ;;
+ esac
+ fi
fi
# Creating directory