diff options
| author | Chris Lamb <lamby@debian.org> | 2009-08-05 00:16:57 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:45 +0100 |
| commit | f315a91f39f9a50d30abe7efb7959d13cbc67199 (patch) | |
| tree | 94b165a26c9e7b10ce1e7b35e62d1dfdeb9af035 | |
| parent | f57203d2476e7875532de04a11f52b46fa6ae8fa (diff) | |
| download | vyos-live-build-f315a91f39f9a50d30abe7efb7959d13cbc67199.tar.gz vyos-live-build-f315a91f39f9a50d30abe7efb7959d13cbc67199.zip | |
Remove potentially-expanding architecture list by making current x86 vars the fallback.
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 14779935a..66a8bde9d 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 |