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

---
 helpers/lh_binary_memtest86 | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'helpers/lh_binary_memtest86')

diff --git a/helpers/lh_binary_memtest86 b/helpers/lh_binary_memtest86
index 1fc343076..c2231f6d5 100755
--- a/helpers/lh_binary_memtest86
+++ b/helpers/lh_binary_memtest86
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-# lh_binary_memtest86(1) - installs memtest86+
+# lh_binary_memtest86(1) - installs memtest86+ into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
 
 set -e
 
@@ -10,6 +15,13 @@ do
 	. ${FUNCTION}
 done
 
+# Set static variables
+DESCRIPTION="installs memtest86+ into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -55,9 +67,10 @@ then
 		esac
 	fi
 
+	# Setting destination directory
 	case "${LIVE_BINARY_IMAGE}" in
 		iso)
-			DESTDIR="binary/isolinux"
+			DESTDIR="binary/live"
 			;;
 
 		net)
@@ -69,6 +82,16 @@ then
 			;;
 	esac
 
+	# Temporary check for broken syslinux
+	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+		esac
+	fi
+
 	# Creating directory
 	if [ ! -d "${DESTDIR}" ]
 	then
@@ -80,7 +103,7 @@ then
 
 	if [ -n "${PACKAGES}" ]
 	then
-		# Removing syslinux
+		# Removing packages
 		case "${LH_APT}" in
 			apt|apt-get)
 				Chroot "apt-get remove --purge --yes ${PACKAGES}"
-- 
cgit v1.2.3