[SCM] live-build branch, debian, updated. debian/3.0_a17-1-10-gb9ddc38

Daniel Baumann daniel at debian.org
Fri Jun 3 10:01:34 UTC 2011


The following commit has been merged in the debian branch:
commit 69f2cc5ee5c28e3f54c1ed83d231ed5a55242ff7
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jun 3 11:56:42 2011 +0200

    Updating grub paths for d-i files (Closes: #627695).

diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index d796750..ee14bd9 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -243,12 +243,12 @@ then
 	INITRD_GI="install/gtk/initrd.gz"
 	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
 
-	if [ -f "binary/boot/${VMLINUZ_DI}" ] && [ -f "binary/boot/${INITRD_DI}" ]
+	if [ -f "binary/${VMLINUZ_DI}" ] && [ -f "binary/${INITRD_DI}" ]
 	then
 		Grub_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
 	fi
 
-	if [ -f "binary/boot/${VMLINUZ_GI}" ] && [ -f "binary/boot/${INITRD_GI}" ]
+	if [ -f "binary/${VMLINUZ_GI}" ] && [ -f "binary/${INITRD_GI}" ]
 	then
 		Grub_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
 	fi

-- 
live-build



More information about the debian-live-changes mailing list