[SCM] debian-live branch, master, updated. 1.0_a48-1-98-gea96223

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 62365340af92fc5b621f434eca356ef2c177a8e2
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Aug 16 03:15:40 2008 +0200

    Preserve changed apt settings (pdiffs, recommends, and secure) in binary image (Closes: #494640).

diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index a7a12d8..111adb9 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -162,16 +162,25 @@ case "${1}" in
 		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
 
 		# Deconfiguring aptitude pdiffs
-		rm -f chroot/etc/apt/apt.conf.d/00pdiffs
+		if [ "${LH_APT_PDIFFS}" = "enabled" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00pdiffs
+		fi
 
 		# Deconfiguring aptitude pipeline
 		rm -f chroot/etc/apt/apt.conf.d/00pipeline
 
 		# Deconfiguring aptitude recommends
-		rm -f chroot/etc/apt/apt.conf.d/00recommends
+		if [ "${LH_APT_RECOMMENDS}" = "enabled" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00recommends
+		fi
 
 		# Deconfiguring aptitude secure
-		rm -f chroot/etc/apt/apt.conf.d/00secure
+		if [ "${LH_APT_SECURE}" = "enabled" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00secure
+		fi
 
 		# Deconfiguring apt preferences
 		if [ -f chroot/etc/apt/preferences.orig ]

-- 
debian-live