diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-02-20 14:10:51 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-02-20 14:12:10 +0100 |
| commit | 47e8fa8c2a359ab9428784b73c131c1ecb53fac0 (patch) | |
| tree | 353e967779f87ec1153242472927482dff6867a4 | |
| parent | ce18a6b9bd84e51cbba550f4c9136536de48e25b (diff) | |
| download | vyos-live-build-47e8fa8c2a359ab9428784b73c131c1ecb53fac0.tar.gz vyos-live-build-47e8fa8c2a359ab9428784b73c131c1ecb53fac0.zip | |
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.
| -rwxr-xr-x | functions/chroot.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index d04380969..be801eb57 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 "${?}" |