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

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-08-24 07:29:37 +0000 (Sat, 24 Aug 2013)
New Revision: 82208

Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/07-edu-ntp-server
Log:
Revert commit 82204. The real problem is failing preseeding of LTSP chroot (using beta1 ISO image).


Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-08-24 04:47:53 UTC (rev 82207)
+++ branches/wheezy/debian-edu-config/Makefile	2013-08-24 07:29:37 UTC (rev 82208)
@@ -387,7 +387,6 @@
 		share/debian-edu-config/tools/wpad-extract \
 		share/debian-edu-config/ltspfs-mounter-kde \
 		share/ltsp/get-ldap-ltsp-config \
-		share/ltsp/init-ltsp.d/07-edu-ntp-server \
 		share/ltsp/init-ltsp.d/08-edu-hostname \
 		share/ltsp/init-ltsp.d/60-edu-diskless-ws \
 		share/ltsp/init-ltsp.d/70-edu-client-core \

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-24 04:47:53 UTC (rev 82207)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-24 07:29:37 UTC (rev 82208)
@@ -4,9 +4,6 @@
   * Fix KDE proxy settings by changing ioslaverc to use
     http://wpad/wpad.dat for proxy settings (ProxyType=2) instead of
     depending on KDE to find the proxy on its own (ProxyType=3).
-  * Add snippet share/ltsp/init-ltsp.d/07-edu-ntp-server. Diskless
-    workstations will use the local ntp server instead of trying to
-    connect to the default internet ntp servers.
 
   [ Petter Reinholdtsen ]
   * Make sure gosa-create ignore errors from nscd, as the calls will

Modified: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/07-edu-ntp-server
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/07-edu-ntp-server	2013-08-24 04:47:53 UTC (rev 82207)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/07-edu-ntp-server	2013-08-24 07:29:37 UTC (rev 82208)
@@ -1,5 +0,0 @@
-#!/bin/sh
-# Set ntp server (LTSP var TIMESERVER) to get /etc/ntp.conf right.
-# Diskless workstations will use the local ntp server instead of
-# the default ones from the net.
-TIMESERVER=ntp