[SCM] Debian Live build scripts branch, master, updated. 1.0.2-3-2-g598c3f2

Daniel Baumann daniel at debian.org
Sun Jan 11 15:28:56 UTC 2009


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

    Prefering local hosts over truncated one.

diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index 7858273..2795a59 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -77,7 +77,12 @@ EOF
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/etc/hosts.orig ]
+		if [ -e config/chroot_local-includes/etc/hosts ]
+		then
+			# Copying local hosts
+			cp -a config/chroot_local-includes/etc/hosts chroot/etc/hosts
+			rm -f chroot/etc/hosts.orig
+		elif [ -f chroot/etc/hosts.orig ]
 		then
 			# Restore hosts file
 			mv chroot/etc/hosts.orig chroot/etc/hosts

-- 
Debian Live build scripts



More information about the debian-live-changes mailing list