[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 3feafc9a700214c61e53edbad9c514fff7984c5e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Jul 4 22:28:20 2008 +0100

    Refactor d-i GTK image selection, ensuring the GTK installer is only chosen on the netboot variant when building on 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 2a79521..90d00f1 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -304,13 +304,25 @@ else
 	wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
 
 	# Downloading graphical-installer
+	DOWNLOAD_GTK_INSTALLER=0
 	case "${LH_ARCHITECTURE}" in
-		amd64|i386|powerpc)
-			mkdir -p "${DESTDIR_GI}"
-			wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
-			wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
-		;;
+		amd64|i386)
+			DOWNLOAD_GTK_INSTALLER=1
+			;;
+		powerpc)
+			if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ]
+			then
+				DOWNLOAD_GTK_INSTALLER=1
+			fi
+			;;
 	esac
+
+	if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ]
+	then
+		mkdir -p "${DESTDIR_GI}"
+		wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
+		wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
+	fi
 fi
 
 # Only download additional packages if appropriate

-- 
debian-live