diff options
-rwxr-xr-x | functions/chroot.sh | 4 | ||||
-rwxr-xr-x | functions/defaults.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index dff13d062..b20fe771f 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -18,10 +18,10 @@ Chroot () if [ "${LB_USE_FAKEROOT}" != "true" ] then - ${LB_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="${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} /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} else # Building with fakeroot/fakechroot - ${LB_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS} + ${LB_ROOT_COMMAND} ${_LINUX32} /usr/sbin/chroot "${CHROOT}" ${COMMANDS} fi return "${?}" diff --git a/functions/defaults.sh b/functions/defaults.sh index 75136f1cc..7870b4f85 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -219,7 +219,9 @@ Set_defaults () if [ "${LB_ARCHITECTURE}" = "i386" ] && [ "$(uname -m)" = "x86_64" ] then - LB_ROOT_COMMAND="${LB_ROOT_COMMAND} linux32" + _LINUX32="linux32" + else + _LINUX32="" fi # Setting tasksel |