[SCM] Debian Live build scripts branch, master, updated. 1.0.2-3-1-gf6c86da

[Daniel Baumann]

The following commit has been merged in the master branch:
commit f6c86da148b9c2bacee9dd762e81ab80f74961f4
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jan 11 16:17:41 2009 +0100

    Prefering local resolv.conf over truncated one.

diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index afa3036..5dcaf42 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -76,7 +76,12 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -e chroot/etc/resolv.conf.orig ]
+		if [ -e config/chroot_local-includes/etc/resolv.conf ]
+		then
+			# Copying local resolv.conf
+			cp -a config/chroot_local-includes/etc/resolv.conf chroot/etc/resolv.conf
+			rm -f chroot/etc/resolv.conf.orig
+		elif [ -e chroot/etc/resolv.conf.orig ]
 		then
 			# Restoring resolv file or symlink
 			mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf

-- 
Debian Live build scripts