diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-05-31 13:12:13 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-05-31 13:12:13 +0200 |
| commit | 3eb2b243cce91885ba6306ca22c0b6581312ba3f (patch) | |
| tree | 025e12d82df04bdf7b480190df06025ff0921c0d /functions/chroot.sh | |
| parent | dc6b3d90da99917b161b6fe76dc52cd7c45d10f9 (diff) | |
| download | vyos-live-build-3eb2b243cce91885ba6306ca22c0b6581312ba3f.tar.gz vyos-live-build-3eb2b243cce91885ba6306ca22c0b6581312ba3f.zip | |
Cleaning http_proxy and ftp_proxy settings in chroot, people using apt proxies set them throught the apt pseudo-proxy options, and people using real proxies use config/environment.{chroot,binary} to set them.
Diffstat (limited to 'functions/chroot.sh')
| -rwxr-xr-x | functions/chroot.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/functions/chroot.sh b/functions/chroot.sh index 417462f3f..10b249f9a 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -25,7 +25,7 @@ Chroot () if [ "${LB_USE_FAKEROOT}" != "true" ] then - ${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" ${ENV} ${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}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${ENV} ${COMMANDS} else # Building with fakeroot/fakechroot ${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS} |