[SCM] live-build branch, debian, updated. debian/3.0_a30-1-31-g468a41f

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 046095cffa06c76406e6cd7321ccbf789d09063a
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 15:16:23 2011 +0200

    Renaming lb_chroot_local-includes into lb_chroot_includes and check for includes in config/includes.chroot.

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index e459c6c..5677a68 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -69,7 +69,7 @@ do
 done
 
 lb chroot_live-packages ${*}
-lb chroot_local-includes ${*}
+lb chroot_includes ${*}
 lb chroot_local-patches ${*}
 lb chroot_hooks ${*}
 lb chroot_hacks ${*}
diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/lb_chroot_hostname
index 81bf4c3..4da8602 100755
--- a/scripts/build/lb_chroot_hostname
+++ b/scripts/build/lb_chroot_hostname
@@ -71,10 +71,10 @@ EOF
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Copying hostname from local-includes, if existing
-		if [ -e config/chroot_local-includes/etc/hostname ]
+		# Copying hostname from includes, if existing
+		if [ -e config/includes.chroot/etc/hostname ]
 		then
-			cp -a config/chroot_local-includes/etc/hostname chroot/etc/hostname
+			cp -a config/includes.chroot/etc/hostname chroot/etc/hostname
 		fi
 
 		Echo_message "Deconfiguring file /bin/hostname"
diff --git a/scripts/build/lb_chroot_hosts b/scripts/build/lb_chroot_hosts
index f246b53..65e85fa 100755
--- a/scripts/build/lb_chroot_hosts
+++ b/scripts/build/lb_chroot_hosts
@@ -73,10 +73,10 @@ EOF
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -e config/chroot_local-includes/etc/hosts ]
+		if [ -e config/includes.chroot/etc/hosts ]
 		then
 			# Copying local hosts
-			cp -a config/chroot_local-includes/etc/hosts chroot/etc/hosts
+			cp -a config/includes.chroot/etc/hosts chroot/etc/hosts
 			rm -f chroot/etc/hosts.orig
 		elif [ -f chroot/etc/hosts.orig ]
 		then
diff --git a/scripts/build/lb_chroot_local-includes b/scripts/build/lb_chroot_includes
similarity index 77%
rename from scripts/build/lb_chroot_local-includes
rename to scripts/build/lb_chroot_includes
index d2c0f8a..0d08dd9 100755
--- a/scripts/build/lb_chroot_local-includes
+++ b/scripts/build/lb_chroot_includes
@@ -14,7 +14,7 @@ set -e
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
 # Setting static variables
-DESCRIPTION="$(Echo 'copy local files into chroot')"
+DESCRIPTION="$(Echo 'copy files into chroot')"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
@@ -24,13 +24,13 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-Echo_message "Begin copying chroot local includes..."
+Echo_message "Begin copying chroot includes..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
-Check_stagefile .stage/chroot_local-includes
+Check_stagefile .stage/includes.chroot
 
 # Checking lock file
 Check_lockfile .lock
@@ -38,13 +38,13 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if Find_files config/chroot_local-includes/
+if Find_files config/includes.chroot/
 then
 	# Copying includes
-	cd config/chroot_local-includes
+	cd config/includes.chroot
 	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot
 	cd "${OLDPWD}"
 
 	# Creating stage file
-	Create_stagefile .stage/chroot_local-includes
+	Create_stagefile .stage/chroot_includes
 fi
diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv
index 1e705dc..e32bdc6 100755
--- a/scripts/build/lb_chroot_resolv
+++ b/scripts/build/lb_chroot_resolv
@@ -72,10 +72,10 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -e config/chroot_local-includes/etc/resolv.conf ]
+		if [ -e config/includes.chroot/etc/resolv.conf ]
 		then
 			# Copying local resolv.conf
-			cp -a config/chroot_local-includes/etc/resolv.conf chroot/etc/resolv.conf
+			cp -a config/includes.chroot/etc/resolv.conf chroot/etc/resolv.conf
 			rm -f chroot/etc/resolv.conf.orig
 		elif [ -e chroot/etc/resolv.conf.orig ]
 		then
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ff14b43..7ac14c5 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1161,7 +1161,7 @@ EOF
 mkdir -p config/archives
 mkdir -p config/chroot_apt
 mkdir -p config/hooks
-mkdir -p config/chroot_local-includes
+mkdir -p config/local.chroot
 mkdir -p config/chroot_local-patches
 mkdir -p config/chroot_packages
 mkdir -p config/package-lists

-- 
live-build