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/defaults.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/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 6 |
1 files changed, 2 insertions, 4 deletions
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 |