[Debian-live-changes] r2269 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-28 14:53:41 +0000 (Thu, 28 Jun 2007)
New Revision: 2269

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:
Reverted r2267; needed for etch compatibility.

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-06-28 14:42:45 UTC (rev 2268)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-06-28 14:53:41 UTC (rev 2269)
@@ -1,8 +1,3 @@
-2007-06-28  Otavio Salvador  <otavio at debian.org>
-
-	* helpers/lh_binary_syslinux:
-	  - Simplified code to multi-arch iso images.
-
 2007-06-27  Otavio Salvador  <otavio at debian.org>
 
 	* helpers/lh_binary_syslinux:

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-28 14:42:45 UTC (rev 2268)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-06-28 14:53:41 UTC (rev 2269)
@@ -145,8 +145,17 @@
 	# Assembling multi-arch
 	if [ -n "${MULTIARCH}" ]
 	then
-		DESTDIR_LIVE="${DESTDIR_LIVE}.${LIVE_ARCHITECTURE}"
-		DESTDIR_INSTALL="${DESTDIR_INSTALL}.${LIVE_ARCHITECTURE}"
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+				;;
+
+			i386)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+				;;
+		esac
 	fi
 fi