[debian-edu-commits] r82239 - in branches/wheezy/debian-edu-config: debian share/ltsp/init-ltsp.d

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-08-28 00:10:54 +0000 (Wed, 28 Aug 2013)
New Revision: 82239

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws
Log:
* init-ltsp.d/60-edu-diskless-ws: 
   - set proxies by calling 'update-proxy-from-wpad' directly instead
     of using dhclient.
   - remove all internet connectivity needing ntp servers from
     /etc/ntp.conf to avoid useless lookups.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-26 21:16:02 UTC (rev 82238)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-28 00:10:54 UTC (rev 82239)
@@ -1,6 +1,11 @@
 debian-edu-config (1.714~svn822XX) UNRELEASED; urgency=low
 
   * init-ltsp.d/08-edu-hostname: fix typos.
+  * init-ltsp.d/60-edu-diskless-ws: 
+     - set proxies by calling 'update-proxy-from-wpad' directly instead
+       of using dhclient.
+     - remove all internet connectivity needing ntp servers from
+       /etc/ntp.conf to avoid useless lookups.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 26 Aug 2013 23:09:49 +0200
 

Modified: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws	2013-08-26 21:16:02 UTC (rev 82238)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws	2013-08-28 00:10:54 UTC (rev 82239)
@@ -10,6 +10,10 @@
             update-rc.d $service enable 2 >/dev/null  2>&1
         done
     fi
-    # Fix proxy setting
-    dhclient -nw
+    # Fix proxy settings.
+    /usr/share/debian-edu-config/tools/update-proxy-from-wpad
+    # Remove all ntp servers except 'ntp' from ntp.conf.
+    if [ -f "/etc/ntp.conf" ]; then
+        sed -i -e '/debian.pool.ntp/d' /etc/ntp.conf
+    fi
 fi