[SCM] debian-live/live-helper branch, master, updated. 1.0_a38-1-12-g6244123

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 6244123de27d6a452414fe650de2aad7b9b6b30b
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Feb 29 16:40:02 2008 +0100

    Including default kernel-img.conf in live-systems.

diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index d8718af..6d9a756 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -128,7 +128,22 @@ EOF
 			mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf
 		else
 			# Removing kernel-img.conf file
-			rm -f chroot/etc/kernel-img.conf
+			#rm -f chroot/etc/kernel-img.conf
+
+# Default file taken from debian-installer etchr2
+cat > chroot/etc/kernel-img.conf << EOF
+# Kernel Image management overrides
+# See kernel-img.conf(5) for details
+do_symlinks = yes
+relative_links = yes
+do_bootloader = no
+do_bootfloppy = no
+do_initrd = yes
+link_in_boot = no
+postinst_hook = update-grub
+postrm_hook   = update-grub
+EOF
+
 		fi
 
 		# Removing stage file

-- 
debian-live/live-helper