[debian-edu-commits] r81538 - in branches/wheezy/debian-edu-install: . debian lib

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-12 10:56:04 +0000 (Fri, 12 Jul 2013)
New Revision: 81538

Modified:
   branches/wheezy/debian-edu-install/debian-edu-profile
   branches/wheezy/debian-edu-install/debian/changelog
   branches/wheezy/debian-edu-install/lib/debian-edu-common
Log:
Adjust debian-edu-profile, making sure proxy settings are used also
for netinst CD (and not only for PXE installs), and adjust the
load_proxy_conf() function to log what proxy setting is used.

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2013-07-12 10:32:09 UTC (rev 81537)
+++ branches/wheezy/debian-edu-install/debian/changelog	2013-07-12 10:56:04 UTC (rev 81538)
@@ -1,3 +1,12 @@
+debian-edu-install (1.716~svn81496) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Adjust debian-edu-profile, making sure proxy settings are used also
+    for netinst CD (and not only for PXE installs), and adjust the
+    load_proxy_conf() function to log what proxy setting is used.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 12 Jul 2013 12:54:41 +0200
+
 debian-edu-install (1.716~svn81495) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-install/debian-edu-profile
===================================================================
--- branches/wheezy/debian-edu-install/debian-edu-profile	2013-07-12 10:32:09 UTC (rev 81537)
+++ branches/wheezy/debian-edu-install/debian-edu-profile	2013-07-12 10:56:04 UTC (rev 81538)
@@ -451,8 +451,6 @@
 	path="/cdrom/dists/$SUITE/Release"
 	cp $path $APTLISTDIR/tmp 2>/dev/null || nogetrel="$path"
     else
-        load_proxy_conf
-
 	path="$PROTOCOL://$MIRROR$DIRECTORY/dists/$SUITE/Release"
 	wget -q "$path" -O $APTLISTDIR/tmp || nogetrel="$path"
     fi
@@ -468,6 +466,7 @@
     log "Setting mirror/distribution to $DISTRIBUTION"
 }
 
+load_proxy_conf
 set_mirror_info
 
 if edu-is-testinstall ; then

Modified: branches/wheezy/debian-edu-install/lib/debian-edu-common
===================================================================
--- branches/wheezy/debian-edu-install/lib/debian-edu-common	2013-07-12 10:32:09 UTC (rev 81537)
+++ branches/wheezy/debian-edu-install/lib/debian-edu-common	2013-07-12 10:56:04 UTC (rev 81538)
@@ -8,4 +8,9 @@
 	    export http_proxy
 	fi
     fi
+    if [ "$http_proxy" ] ; then
+	logger -t lib/debian-edu-common "info: using http_proxy=$http_proxy."
+    else
+	logger -t lib/debian-edu-common "info: no proxy used."
+    fi
 }