[SCM] Debian Live build scripts branch, master, updated. 1.0.2-2-9-gc0947d4

[Daniel Baumann]

The following commit has been merged in the master branch:
commit c0947d49a1a82bb6127fa64877d28ca6a202253e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 10 21:18:53 2009 +0100

    Truncating resolv.conf created during bootstrap stage, otherwise we'll end up with a local resolv.conf in the final image. Thanks to Ben Armstrong <synrg at debian.org>.

diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index bad2357..afa3036 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -48,6 +48,13 @@ case "${1}" in
 		then
 			# Save resolv file or symlink
 			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+
+			# Also truncate it, otherwise we'll end up with the one
+			# created by debootstrap in the final image.
+			#
+			# If you want to have a custom resolv.conf, please
+			# overwrite it with normal local_includes mechanism.
+			Truncate chroot/etc/resolv.conf.orig
 		fi
 
 		if [ -f /etc/resolv.conf ]

-- 
Debian Live build scripts