[Debian-live-changes] r1038 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-12 07:47:55 +0000 (Thu, 12 Apr 2007)
New Revision: 1038

Modified:
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_linuximage
   dists/trunk/live-helper/helpers/lh_binary_memtest86
   dists/trunk/live-helper/helpers/lh_binary_syslinux
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-11 23:05:07 UTC (rev 1037)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-12 07:47:55 UTC (rev 1038)
@@ -101,11 +101,15 @@
 # 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

Modified: dists/trunk/live-helper/helpers/lh_binary_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linuximage	2007-04-11 23:05:07 UTC (rev 1037)
+++ dists/trunk/live-helper/helpers/lh_binary_linuximage	2007-04-12 07:47:55 UTC (rev 1038)
@@ -66,11 +66,15 @@
 # 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

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest86
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest86	2007-04-11 23:05:07 UTC (rev 1037)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest86	2007-04-12 07:47:55 UTC (rev 1038)
@@ -90,11 +90,15 @@
 	# 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

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-11 23:05:07 UTC (rev 1037)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-12 07:47:55 UTC (rev 1038)
@@ -82,7 +82,7 @@
 			;;
 
 		aptitude)
-		Chroot "aptitude install --assume-yes ${PACKAGES}"
+			Chroot "aptitude install --assume-yes ${PACKAGES}"
 			;;
 	esac
 fi
@@ -105,11 +105,15 @@
 # Temporary check for broken syslinux
 if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 then
-	case "${LIVE_ARCHITECTURE}" in
-		i386)
-			DESTDIR="${DESTDIR}.386"
-			;;
-	esac
+	# Assembling multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+		esac
+	fi
 fi
 
 # Creating directory