diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-07-04 22:25:47 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:36 +0100 |
| commit | 19039961c863db62c0c411d51f142216e972cf29 (patch) | |
| tree | e72f53cbc945011ec1d00b29b68d7a6ca2bb2e34 | |
| parent | cfc182e161afe2235515139d962e2e25f1f087cf (diff) | |
| download | vyos-live-build-19039961c863db62c0c411d51f142216e972cf29.tar.gz vyos-live-build-19039961c863db62c0c411d51f142216e972cf29.zip | |
Refactor remote d-i location handling and ensure correct locations for powerpc.
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index ee437ab3b..208d4b829 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})" |