diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:50 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:29 +0100 |
| commit | 4739146fc6c4de8b16418517bb882312c475195c (patch) | |
| tree | a3c29d97d1ead4ad4fa532b1c6bfdb419f160e71 /helpers/lh_binary_linuximage | |
| parent | 1863ed88740575342008ac5f694d03e944bcece2 (diff) | |
| download | live-build-4739146fc6c4de8b16418517bb882312c475195c.zip live-build-4739146fc6c4de8b16418517bb882312c475195c.tar.gz | |
Adding live-helper 1.0~a6-1.
Diffstat (limited to 'helpers/lh_binary_linuximage')
| -rwxr-xr-x | helpers/lh_binary_linuximage | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage index bcdddc1..600aeaa 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 |