summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-02-14 15:43:47 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:04 +0100
commit40c5cf8d4af678bded1e27a567d149f45cf54d19 (patch)
treecd97a58435cc262efde96119c67be1e1313206f0 /functions
parent39338f7b16b33bb7b6d54cadaa1bdb56c6f4c44f (diff)
downloadlive-build-40c5cf8d4af678bded1e27a567d149f45cf54d19.zip
live-build-40c5cf8d4af678bded1e27a567d149f45cf54d19.tar.gz
Calling /usr/sbin/chroot with full path in Chroot(); should fix path problems when using live-helper from a local source tree.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/chroot.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh
index e3af0c2..ba93bf7 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -17,10 +17,10 @@ Chroot ()
if [ "${LH_USE_FAKEROOT}" != "true" ]
then
- ${LH_ROOT_COMMAND} 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="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
+ ${LH_ROOT_COMMAND} /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="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
else
# Building with fakeroot/fakechroot
- ${LH_ROOT_COMMAND} chroot "${CHROOT}" ${COMMANDS}
+ ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS}
fi
return "${?}"