[SCM] debian-live branch, master, updated. 1.0_a48-1-59-gac521c2

[Chris Lamb]

The following commit has been merged in the master branch:
commit 0dedf4e26eba7650a13861d0e62259df3e39b207
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Aug 12 18:33:15 2008 +0100

    Revert "Don't remove the chroot's APT configuration (Closes: #494640)"
    
    This reverts commit 2ae826ad3f5849dedb954ed13dc518a4a8c6b12c.

diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 884d01a..1e6ab56 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -134,6 +134,24 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
+		# Deconfiguring aptitude ftp proxy
+		rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
+
+		# Deconfiguring aptitude http proxy
+		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
+
+		# Deconfiguring aptitude pdiffs
+		rm -f chroot/etc/apt/apt.conf.d/00pdiffs
+
+		# Deconfiguring aptitude pipeline
+		rm -f chroot/etc/apt/apt.conf.d/00pipeline
+
+		# Deconfiguring aptitude recommends
+		rm -f chroot/etc/apt/apt.conf.d/00recommends
+
+		# Deconfiguring aptitude secure
+		rm -f chroot/etc/apt/apt.conf.d/00secure
+
 		# Deconfiguring apt preferences
 		if [ -f chroot/etc/apt/preferences.orig ]
 		then

-- 
debian-live