[SCM] live-build branch, debian, updated. debian/3.0_a47-1-8-g3a864f6

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit cb3d6ca77f18aeb17cb72880ac599f2e850cd5a3
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu May 24 09:41:27 2012 +0200

    Allowing to inject variables through config/environment.chroot into the chroots environment.

diff --git a/functions/chroot.sh b/functions/chroot.sh
index be801eb..417462f 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -16,12 +16,19 @@ Chroot ()
 	# Executing commands in chroot
 	Echo_debug "Executing: %s" "${COMMANDS}"
 
+	if [ -e config/environment.chroot ]
+	then
+		ENV="$(cat config/environment.chroot)"
+	else
+		ENV=""
+	fi
+
 	if [ "${LB_USE_FAKEROOT}" != "true" ]
 	then
-		${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LB_APT_FTP_PROXY}" http_proxy="${LB_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
+		${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LB_APT_FTP_PROXY}" http_proxy="${LB_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${ENV} ${COMMANDS}
 	else
 		# Building with fakeroot/fakechroot
-		${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${COMMANDS}
+		${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS}
 	fi
 
 	return "${?}"

-- 
live-build