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

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-28 10:30:08 +0000 (Wed, 28 Aug 2013)
New Revision: 82241

Modified:
   branches/wheezy/debian-edu-config/cf/cf.ntp
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws
Log:
Move code to remove unwanted NTP servers from the NTP setup on
LTSP clients from init-ltsp.d/60-edu-diskless-ws to cf/cf.ntp, to
make sure it is only done once during installation and not every
time a client boot.

Modified: branches/wheezy/debian-edu-config/cf/cf.ntp
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.ntp	2013-08-28 10:22:21 UTC (rev 82240)
+++ branches/wheezy/debian-edu-config/cf/cf.ntp	2013-08-28 10:30:08 UTC (rev 82241)
@@ -29,3 +29,9 @@
     { /etc/ntp.conf
         AppendIfNoSuchLine "server ntp iburst"
     }
+
+  # Remove all ntp servers except 'ntp' (aka tjener) from ntp.conf.
+  debian.ltspclient.installation::
+    { /etc/ntp.conf
+        CommentLinesMatching "debian.pool.ntp"
+    }

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-28 10:22:21 UTC (rev 82240)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-28 10:30:08 UTC (rev 82241)
@@ -13,6 +13,10 @@
     that $LANGCODE can contain multiple values separated by colon.
   * Rewrite code to show welcome page to show
     http://www.skolelinux.org/ if no URL is found in LDAP.
+  * Move code to remove unwanted NTP servers from the NTP setup on
+    LTSP clients from init-ltsp.d/60-edu-diskless-ws to cf/cf.ntp, to
+    make sure it is only done once during installation and not every
+    time a client boot.
 
  -- 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-28 10:22:21 UTC (rev 82240)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws	2013-08-28 10:30:08 UTC (rev 82241)
@@ -12,8 +12,4 @@
     fi
     # 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