summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-06-14 17:30:32 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:35 +0100
commit85493ae3b22028a4d17a06d4b893f21cf74a959b (patch)
tree396dc0bfb3401e412159290c1d26196c2c16b9d7
parent1bd10cea37374b89bcd0bfda8898189cc333121c (diff)
downloadvyos-live-build-85493ae3b22028a4d17a06d4b893f21cf74a959b.tar.gz
vyos-live-build-85493ae3b22028a4d17a06d4b893f21cf74a959b.zip
Move Etch syslinux workaround closer to the original definitions
-rwxr-xr-xhelpers/lh_binary_debian-installer16
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index de5dc3d60..97ed2106d 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -131,14 +131,6 @@ esac
Check_multiarchitecture
-VMLINUZ_DI="vmlinuz"
-INITRD_DI="initrd.gz"
-DESTDIR_DI="${DESTDIR}"
-
-VMLINUZ_GI="gtk/vmlinuz"
-INITRD_GI="gtk/initrd.gz"
-DESTDIR_GI="${DESTDIR}/gtk"
-
Install_file() {
local FILE
FILE="${1}"
@@ -170,6 +162,14 @@ Install_file() {
cp "${FILE}" "${TARGET}"/"${LETTER}"/"${SOURCE}"
}
+VMLINUZ_DI="vmlinuz"
+INITRD_DI="initrd.gz"
+DESTDIR_DI="${DESTDIR}"
+
+VMLINUZ_GI="gtk/vmlinuz"
+INITRD_GI="gtk/initrd.gz"
+DESTDIR_GI="${DESTDIR}/gtk"
+
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LH_DISTRIBUTION}" = "etch" ]
then