[SCM] debian-live branch, master, updated. 1.0_a47-1-19-g2505291

[Chris Lamb]

The following commit has been merged in the master branch:
commit 0d1122d0ab7e43f5a1ef1432e8ad7fb475031b7f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Jun 14 17:30:32 2008 +0100

    Move Etch syslinux workaround closer to the original definitions
    
    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 de5dc3d..97ed210 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

-- 
debian-live