summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_linuximage
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:52 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commitbd1a5ddc8203907eb40135303bea5488397ec5d0 (patch)
treee1cdc0adec3e4799f5db5ad1a8b34800e28a9439 /helpers/lh_binary_linuximage
parent8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1 (diff)
downloadlive-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.zip
live-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.tar.gz
Adding live-helper 1.0~a8-1.
Diffstat (limited to 'helpers/lh_binary_linuximage')
-rwxr-xr-xhelpers/lh_binary_linuximage15
1 files changed, 12 insertions, 3 deletions
diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage
index 600aeaa..629ef77 100755
--- a/helpers/lh_binary_linuximage
+++ b/helpers/lh_binary_linuximage
@@ -25,10 +25,11 @@ Arguments "${@}"
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_linuximage: Init"
@@ -58,7 +59,7 @@ case "${LIVE_BINARY_IMAGE}" in
DESTDIR="tftpboot"
;;
- usb|hdd)
+ usb-hdd|hdd)
DESTDIR="binary"
;;
esac
@@ -70,9 +71,17 @@ then
if [ -n "${MULTIARCH}" ]
then
case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ DESTDIR="${DESTDIR}.amd"
+ ;;
+
i386)
DESTDIR="${DESTDIR}.386"
;;
+
+ powerpc)
+ DESTDIR="${DESTDIR}.ppc"
+ ;;
esac
fi
fi