[SCM] live-build branch, debian, updated. debian/3.0_a60-1-10-gf735d98

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 880e6e07364a405ed225416a1c020d8dc0918db2
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 30 09:42:13 2012 +0200

    Adding slightly modified patch from Adam Conrad <adconrad at ubuntu.com> to remove resolvconf artifacts.

diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
index b82e366..42ba071 100755
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -90,6 +90,13 @@ case "${1}" in
 			Truncate chroot/etc/resolv.conf
 		fi
 
+		# Clean up resolvconf's pollution
+		if [ -e chroot/etc/resolvconf/resolv.conf.d ]
+		then
+			rm -f chroot/etc/resolvconf/resolv.conf.d/original
+			rm -f chroot/etc/resolvconf/resolv.conf.d/tail
+		fi
+
 		# Removing stage file
 		rm -f .build/chroot_resolv
 		;;

-- 
live-build