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

[Daniel Baumann]

The following commit has been merged in the master branch:
commit ccb76dc4a47e09e98339cb1309ac0b4b3a851655
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Feb 29 17:29:00 2008 +0100

    It's actually enough to just truncate kernel-img.conf and also less invasive than including a default configuration.

diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index 6d9a756..eafaaa6 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -128,22 +128,7 @@ 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
-
-# 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
-
+			Truncate chroot/etc/kernel-img.conf
 		fi
 
 		# Removing stage file

-- 
debian-live/live-helper