[SCM] debian-live branch, master, updated. 1.0_a48-1-10-g04b0737

[Chris Lamb]

The following commit has been merged in the master branch:
commit 3199a409fade444b1aecc2c6e3a87b8bd54429e0
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Jul 29 00:48:31 2008 +0100

    Don't duplicate gtk and non-gtk kernels if they are identical.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 408b48d..4b99b26 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -226,6 +226,13 @@ then
 	INITRD_GI="install/gtk/initrd.gz"
 	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
 
+	if cmp -s ${VMLINUZ_DI} ${VMLINUZ_GI}
+	then
+		# Kernels are identical; we can save space by removing one of them.
+		rm ${VMLINUZ_GI}
+		VMLINUZ_GI="${VMLINUZ_DI}"
+	fi
+
 	Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
 	Grub_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
 	Grub_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index f0338ae..a6e3183 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -522,6 +522,13 @@ then
 	INITRD_GI="gtk/initrd.gz"
 	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
 
+	if cmp -s ${VMLINUZ_DI} ${VMLINUZ_GI}
+	then
+		# Kernels are identical; we can save space by removing one of them.
+		rm ${VMLINUZ_GI}
+		VMLINUZ_GI="${VMLINUZ_DI}"
+	fi
+
 	Syslinux_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
 	Syslinux_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
 fi

-- 
debian-live