[SCM] Debian Live build scripts branch, master, updated. 1.0.2-2-6-gff2bdad

[Daniel Baumann]

The following commit has been merged in the master branch:
commit ff2bdad21936ba5937b9000c6b06d25815bed3bf
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jan 9 16:17:31 2009 +0100

    Also handling custom apt.conf in config/chroot_apt/apt.conf to allow further apt configuration (Closes: #511247).

diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index b82e3ee..f7adb07 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -101,6 +101,17 @@ case "${1}" in
 				;;
 		esac
 
+		# Configuring apt config
+		if [ -f config/chroot_apt/apt.conf ]
+		then
+			if [ -f chroot/etc/apt/apt.conf ]
+			then
+				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
+			fi
+
+			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
+		fi
+
 		# Configuring apt preferences
 		if [ -f config/chroot_apt/preferences ]
 		then
@@ -182,6 +193,17 @@ case "${1}" in
 			rm -f chroot/etc/apt/apt.conf.d/00secure
 		fi
 
+		# Configuring apt config
+		if [ -f config/chroot_apt/apt.conf ]
+		then
+			if [ -f chroot/etc/apt/apt.conf ]
+			then
+				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
+			fi
+
+			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
+		fi
+
 		# Deconfiguring apt preferences
 		if [ -f chroot/etc/apt/preferences.orig ]
 		then

-- 
Debian Live build scripts