[debian-edu-commits] r81198 - in branches/wheezy/debian-edu-config: cf debian sbin

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-27 13:09:43 +0000 (Thu, 27 Jun 2013)
New Revision: 81198

Modified:
   branches/wheezy/debian-edu-config/cf/cf.inetd
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
Log:
Add d-i preseeding for netcfg/dhcp_ntp_servers, as d-i/netcfg/clock-
setup do not seem to notice the ntp-server DHCP option passed to
clients, to make sure clients have correct clock during installation
even when behind a blocking firewall.

Modified: branches/wheezy/debian-edu-config/cf/cf.inetd
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.inetd	2013-06-27 12:05:36 UTC (rev 81197)
+++ branches/wheezy/debian-edu-config/cf/cf.inetd	2013-06-27 13:09:43 UTC (rev 81198)
@@ -8,7 +8,9 @@
 	{ /etc/inetd.conf
 		HashCommentLinesStarting "discard"
 		HashCommentLinesStarting "daytime"
-		HashCommentLinesStarting "time"
+# Do not disable the time service, it is used by clock-setup in
+# debian-installer to set the time on the installing client.
+#		HashCommentLinesStarting "time"
 	}
 
     # Standalone hosts should not listen to incoming SMTP connections.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-27 12:05:36 UTC (rev 81197)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-27 13:09:43 UTC (rev 81198)
@@ -1,3 +1,13 @@
+debian-edu-config (1.708~svn81198) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Add d-i preseeding for netcfg/dhcp_ntp_servers, as d-i/netcfg/clock-
+    setup do not seem to notice the ntp-server DHCP option passed to
+    clients, to make sure clients have correct clock during installation
+    even when behind a blocking firewall.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 27 Jun 2013 15:08:49 +0200
+
 debian-edu-config (1.708~svn81197) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-27 12:05:36 UTC (rev 81197)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-27 13:09:43 UTC (rev 81198)
@@ -196,6 +196,11 @@
 d-i ltsp-client-builder/use_cdrom boolean false
 d-i ltsp-client-builder/build-client-opts string --mirror $mirrorurl --dist $dist
 
+# Tell PXE clients to fetch the correct time from the central NTP server
+# d-i is unable to discover the ntp-server DHCP option.  Hardcode
+# setting here instead.
+d-i netcfg/dhcp_ntp_servers string ntp
+
 # Pass on the time zone used on the main-server
 EOF
     debconf-get-selections --installer | grep -w 'time/zone'