[SCM] debian-live branch, master, updated. 1.0_a47-1-61-g3b540b4

[Chris Lamb]

The following commit has been merged in the master branch:
commit 70925408b65494d71b3546510cbfc54040f752f8
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Jul 4 22:25:47 2008 +0100

    Refactor remote d-i location handling and ensure correct locations for powerpc.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index ee437ab..208d4b8 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -111,24 +111,39 @@ case "${LH_DEBIAN_INSTALLER}" in
 		;;
 esac
 
-case "${DI_IMAGE_TYPE}" in
-	netboot)
-		DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}"
-		DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}"
-		DI_REMOTE_KERNEL="linux"
-		;;
-	cdrom)
-		DI_REMOTE_BASE="cdrom"
-		DI_REMOTE_BASE_GTK="cdrom/gtk"
-		DI_REMOTE_KERNEL="vmlinuz"
-		;;
-esac
-
 # Varous architecture-specific hacks
 case "${LH_ARCHITECTURE}" in
+	i386|amd64)
+		case "${DI_IMAGE_TYPE}" in
+			netboot)
+				DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}"
+				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}"
+				DI_REMOTE_KERNEL="linux"
+				;;
+
+			cdrom)
+				DI_REMOTE_BASE="cdrom"
+				DI_REMOTE_BASE_GTK="cdrom/gtk"
+				DI_REMOTE_KERNEL="vmlinuz"
+				;;
+		esac
+		;;
+
 	powerpc)
-		DI_REMOTE_BASE="${LH_ARCHITECTURE}/${DI_REMOTE_BASE}"
+		case "${DI_IMAGE_TYPE}" in
+			cdrom)
+				DI_REMOTE_BASE="${LH_ARCHITECTURE}/cdrom"
+			;;
+
+			netboot)
+				DI_REMOTE_BASE="${LH_ARCHITECTURE}/netboot"
+				;;
+		esac
+
+		DI_REMOTE_KERNEL="vmlinux"
+		DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk"
 		;;
+
 	sparc)
 		DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
 		DI_REMOTE_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"

-- 
debian-live