From bd1a5ddc8203907eb40135303bea5488397ec5d0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:52 +0200
Subject: Adding live-helper 1.0~a8-1.

---
 helpers/lh_binary_memtest | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'helpers/lh_binary_memtest')

diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index ea0742276..edf3830ed 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -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
 
 if [ "${LIVE_MEMTEST}" = "disabled" ]
@@ -80,7 +81,7 @@ case "${LIVE_BINARY_IMAGE}" in
 		DESTDIR="tftpboot"
 		;;
 
-	usb|hdd)
+	usb-hdd|hdd)
 		DESTDIR="binary"
 		;;
 esac
@@ -92,6 +93,10 @@ then
 	if [ -n "${MULTIARCH}" ]
 	then
 		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
 			i386)
 				DESTDIR="${DESTDIR}.386"
 				;;
-- 
cgit v1.2.3