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

Avoid to hijack root-command with linux32, rather set use it in the chroot function only.

This commit is contained in:
Daniel Baumann 2011-07-20 18:10:39 +02:00
parent 6a844f1bb2
commit b7f70c339f
2 changed files with 5 additions and 3 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} /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 "${?}"

4
functions/defaults.sh
View File

@ -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