From 19039961c863db62c0c411d51f142216e972cf29 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri, 4 Jul 2008 22:25:47 +0100
Subject: Refactor remote d-i location handling and ensure correct locations
for powerpc.
---
helpers/lh_binary_debian-installer | 43 +++++++++++++++++++++++++-------------
1 file changed, 29 insertions(+), 14 deletions(-)
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})"
--
cgit v1.0