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

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-26 09:15:17 +0000 (Mon, 26 Aug 2013)
New Revision: 82221

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/08-edu-hostname
Log:
Make sure LTSP host name setting work properly by calling
ltsp-init-ltsp.d/10-resolv-conf before 08-edu-hostname, thus
allowing DNS lookups to determine host name and shave 10 seconds
from the boot time.  Thanks to Wolfgang Schweer for discovering
the problem.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-26 06:18:04 UTC (rev 82220)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-26 09:15:17 UTC (rev 82221)
@@ -1,3 +1,14 @@
+debian-edu-config (1.714~svn82214) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Make sure LTSP host name setting work properly by calling
+    ltsp-init-ltsp.d/10-resolv-conf before 08-edu-hostname, thus
+    allowing DNS lookups to determine host name and shave 10 seconds
+    from the boot time.  Thanks to Wolfgang Schweer for discovering
+    the problem.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Mon, 26 Aug 2013 11:10:00 +0200
+
 debian-edu-config (1.714~svn82213) wheezy-test; urgency=low
 
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/08-edu-hostname
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/08-edu-hostname	2013-08-26 06:18:04 UTC (rev 82220)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/08-edu-hostname	2013-08-26 09:15:17 UTC (rev 82221)
@@ -1,4 +1,10 @@
 #!/bin/sh
 
+# Reorder scripts to make sure host name setting can use DNS lookup
+dnsinit=/usr/share/ltsp-init-ltsp.d/10-resolv-conf 
+if [ -x $dnsinit ] ; then
+    . $dnsinit
+fi
+
 # Update hostname based on DNS or MAC address using our name scheme
 HOSTNAME=$(/usr/sbin/update-hostname-from-ip -m -n)