From f315a91f39f9a50d30abe7efb7959d13cbc67199 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@debian.org>
Date: Wed, 5 Aug 2009 00:16:57 +0100
Subject: Remove potentially-expanding architecture list by making current x86
 vars the fallback.

---
 helpers/lh_binary_debian-installer | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 1477993..66a8bde 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -116,24 +116,8 @@ case "${LH_DEBIAN_INSTALLER}" in
 		;;
 esac
 
-# Varous architecture-specific hacks
+# Set architecture-specific variables
 case "${LH_ARCHITECTURE}" in
-	i386|amd64|lpia)
-		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)
 		case "${DI_IMAGE_TYPE}" in
 			cdrom)
@@ -161,6 +145,21 @@ case "${LH_ARCHITECTURE}" in
 			DI_REMOTE_BASE="cdrom"
 		fi
 		;;
+	*)
+		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
+		;;
 esac
 
 Check_multiarchitecture
-- 
cgit v1.0