From 3eb2b243cce91885ba6306ca22c0b6581312ba3f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 31 May 2012 13:12:13 +0200 Subject: 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. --- functions/chroot.sh | 2 +- functions/defaults.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'functions') 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} diff --git a/functions/defaults.sh b/functions/defaults.sh index 5a5550348..9d28dd5aa 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -104,12 +104,10 @@ Set_defaults () LB_APT="${LB_APT:-apt}" # Setting apt ftp proxy - LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY:-${ftp_proxy}}" - ftp_proxy="${ftp_proxy:-${LB_APT_FTP_PROXY}}" + LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}" # Setting apt http proxy - LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY:-${http_proxy}}" - http_proxy="${http_proxy:-${LB_APT_HTTP_PROXY}}" + LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}" # Setting apt pipeline # LB_APT_PIPELINE -- cgit v1.2.3