Calling /usr/sbin/chroot with full path in Chroot(); should fix path problems when using live-helper from a local source tree.
This commit is contained in:
parent
39338f7b16
commit
40c5cf8d4a
|
@ -17,10 +17,10 @@ Chroot ()
|
||||||
|
|
||||||
if [ "${LH_USE_FAKEROOT}" != "true" ]
|
if [ "${LH_USE_FAKEROOT}" != "true" ]
|
||||||
then
|
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
|
else
|
||||||
# Building with fakeroot/fakechroot
|
# Building with fakeroot/fakechroot
|
||||||
${LH_ROOT_COMMAND} chroot "${CHROOT}" ${COMMANDS}
|
${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return "${?}"
|
return "${?}"
|
||||||
|
|
Loading…
Reference in New Issue