[SCM] debian-live branch, master, updated. 1.0_a47-1-72-g3aa34e3

[Chris Lamb]

The following commit has been merged in the master branch:
commit 3aa34e3461baa90ff4af76b1af36e8afda16d65e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Jul 10 21:54:02 2008 +0100

    Fix a bug where a /etc/apt/preferences supplied in chroot_local-includes was always being deleted when used in conjunction with config/chroot_apt/preferences.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 0558146..6bfb7c3 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -144,7 +144,7 @@ case "${1}" in
 		rm -f chroot/etc/apt/apt.conf.d/00secure
 
 		# Deconfiguring apt preferences
-		if [ -f config/chroot_apt/preferences.orig ]
+		if [ -f chroot/etc/apt/preferences.orig ]
 		then
 			mv chroot/etc/apt/preferences.orig chroot/etc/apt/preferences
 		else

-- 
debian-live