[SCM] live-build branch, debian, updated. debian/3.0_a45-1-23-g982e2fb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 47e8fa8c2a359ab9428784b73c131c1ecb53fac0
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Feb 20 14:10:51 2012 +0100

    Removing full path from chroot calls in chroot function.
    
    Temporarily, we had /usr/share/live/build/scripts/build/lb_* named
    without the lb_* prefix which made calling chroot being called with
    full path in order to diffrentiate between lb chroot and /usr/sbin/chroot
    when usling live-build from a local source tree.

diff --git a/functions/chroot.sh b/functions/chroot.sh
index d043809..be801eb 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -18,10 +18,10 @@ Chroot ()
 
 	if [ "${LB_USE_FAKEROOT}" != "true" ]
 	then
-		${LB_ROOT_COMMAND} ${_LINUX32} /usr/sbin/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" ${COMMANDS}
 	else
 		# Building with fakeroot/fakechroot
-		${LB_ROOT_COMMAND} ${_LINUX32} /usr/sbin/chroot "${CHROOT}" ${COMMANDS}
+		${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${COMMANDS}
 	fi
 
 	return "${?}"

-- 
live-build