[SCM] debian-live branch, master, updated. 1.0_a47-1-73-g03ad962

[Chris Lamb]

The following commit has been merged in the master branch:
commit 03ad96281ef1919325d5febfefc04d38870c8371
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Jul 11 00:37:51 2008 +0100

    Correct d-i kernel and initrd locations in grub entries. Thanks to Jun NOGATA <nogajun at gmail.com> for the patch. (Closes: #490245)
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 2cedaa4..408b48d 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -218,12 +218,12 @@ then
 	LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
 	LINUX_INSTALL="title\t\tInstaller:\nroot"
 
-	VMLINUZ_DI="vmlinuz"
-	INITRD_DI="initrd.gz"
+	VMLINUZ_DI="install/vmlinuz"
+	INITRD_DI="install/initrd.gz"
 	APPEND_DI="vga=normal"
 
-	VMLINUZ_GI="gtk/vmlinuz"
-	INITRD_GI="gtk/initrd.gz"
+	VMLINUZ_GI="install/gtk/vmlinuz"
+	INITRD_GI="install/gtk/initrd.gz"
 	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
 
 	Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"

-- 
debian-live