manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Baumann 2012-02-20 14:10:51 +01:00
parent ce18a6b9bd
commit 47e8fa8c2a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions/chroot.sh
View File

@ -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 "${?}"