[debian-edu-commits] debian-edu/ 01/01: Adjust 000-arch-detection LTSP script to set http_proxy from the APT setup before calling wget, in case the proxy is needed to reach the Internet.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit cee9084193d45324dd54492476fcaf0987add0d0
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Oct 23 21:30:36 2014 +0200

    Adjust 000-arch-detection LTSP script to set http_proxy from the APT setup before calling wget, in case the proxy is needed to reach the Internet.
---
 debian/changelog                                                 | 3 +++
 .../plugins/ltsp-build-client/Debian-custom/000-arch-detection   | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8cccda1..e8cb6f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ debian-edu-config (1.813) UNRELEASED; urgency=low
   * Reduce the versioned dependency on education-tasks from (>= 1.808)
     to (>= 1.806), avoiding a LTSP installation problem when installing
     i386 packages with our test repository.
+  * Adjust 000-arch-detection LTSP script to set http_proxy from the APT
+    setup before calling wget, in case the proxy is needed to reach the
+    Internet.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 23 Oct 2014 10:35:10 +0200
 
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection b/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
index 5af5081..9451e88 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
@@ -10,6 +10,15 @@ case $MODE in
 	    echo "info: Missing LTSP dist value, setting to $option_dist_value"
 	fi
 
+	# Make sure to inherit proxy setting from host, inspired by
+	# ltsp-build-client/Debian/010-http-proxy in the ltsp-server
+	# package.  See also bug #766460.
+	if [ -z "$http_proxy" ]; then
+	    eval $(apt-config shell http_proxy acquire::http::proxy)
+	    [ "$http_proxy" = "false" ] && http_proxy=""
+	    export http_proxy
+	fi
+
 	# Force network APT source for the netinst CD, as the i386
 	# binaries are missing on the CD.
 	if [ file:///media/cdrom = "$option_mirror_value" ] ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git