[debian-edu-commits] r80546 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-12 14:45:27 +0000 (Wed, 12 Jun 2013)
New Revision: 80546

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/run-at-firstboot
Log:
Adjust run-at-first-boot to call update-proxy-from-wpad on the
Main Server, to try to get the proxy setup working.  The automatic
proxy setup only run from dhcp, which the Main Server do not use.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-12 12:00:01 UTC (rev 80545)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-12 14:45:27 UTC (rev 80546)
@@ -4,6 +4,9 @@
   * Replicate how d-i is operating, and add code in LTSP setup script
     032-edu-pkgs to run dpkg with the force-unsafe-io flag when creating
     the LTSP chroot, to try to speed up the process.
+  * Adjust run-at-first-boot to call update-proxy-from-wpad on the
+    Main Server, to try to get the proxy setup working.  The automatic
+    proxy setup only run from dhcp, which the Main Server do not use.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 12 Jun 2013 13:58:40 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/run-at-firstboot
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/run-at-firstboot	2013-06-12 12:00:01 UTC (rev 80545)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/run-at-firstboot	2013-06-12 14:45:27 UTC (rev 80546)
@@ -52,6 +52,15 @@
 	. /etc/environment
 	export http_proxy ftp_proxy
     fi
+
+    # Try to set from wpad file, as this normally is called from
+    # dhcp, and the main-server have static IP setup.
+    if [ -z "$http_proxy" ] ; then
+	/usr/share/debian-edu-config/tools/update-proxy-from-wpad
+	. /etc/environment
+	export http_proxy ftp_proxy
+    fi
+
     /usr/sbin/debian-edu-pxeinstall
 fi