[debian-edu-commits] debian-edu/ 01/01: debian-edu-profile: Enable plain apt proxy use on NATed network.

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch master
in repository debian-edu-install.

commit aee53775a8b85942e862360956a2296175d85222
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Nov 20 16:10:42 2017 +0100

    debian-edu-profile: Enable plain apt proxy use on NATed network.
    
     Allow to set such a proxy (like e.g. apt-cacher-ng) on the kernel
     command line (or in expert mode via d-i gui) if on a network with
     a running DHCPD server or on a network with NAT enabled on the gateway
     and manual network configuration on the client.
---
 debian-edu-profile |  3 ++-
 debian/changelog   | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian-edu-profile b/debian-edu-profile
index 7fcbbe5..954b9b6 100755
--- a/debian-edu-profile
+++ b/debian-edu-profile
@@ -475,7 +475,8 @@ if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray' /cdrom/.disk/cd_type; t
     db_set "apt-setup/use_mirror" false
     db_fset "apt-setup/use_mirror" seen true || true
     log "disabling mirror selection on dvd's"
-elif ! log-output wget -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.debian.org/debian/README ; then
+elif ! log-output wget -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.debian.org/debian/README && \
+    ! log-output wget --no-proxy -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.debian.org/debian/README ; then
     db_settitle debian-edu-install/no-network/title
     db_input critical "debian-edu-install/no-network" || true
     db_go || true
diff --git a/debian/changelog b/debian/changelog
index 38d1bd0..bcaedce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-install (1.920) UNRELEASED; urgency=medium
+
+  * debian-edu-profile: Enable plain apt proxy use on NATed network.
+    Allow to set such a proxy (like e.g. apt-cacher-ng) on the kernel
+    command line (or in expert mode via d-i gui) if on a network with
+    a running DHCPD server or on a network with NAT enabled on the gateway
+    and manual network configuration on the client.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 20 Nov 2017 15:56:09 +0100
+
 debian-edu-install (1.919) unstable; urgency=medium
 
   * Bump Standards-Version to 4.1.1, no changes needed.

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