[debian-edu-commits] r81396 - in branches/wheezy/debian-edu-config: . debian share/debian-edu-config/d-i

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-06 11:20:26 +0000 (Sat, 06 Jul 2013)
New Revision: 81396

Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel
Log:
Reintroduce /usr/sbin/update-hostname-from-ip which was dropped in
r73306 and r73313, to make sure machines get their hostname set
from DNS during installation.

Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-07-06 10:40:31 UTC (rev 81395)
+++ branches/wheezy/debian-edu-config/Makefile	2013-07-06 11:20:26 UTC (rev 81396)
@@ -16,7 +16,8 @@
 	debian-edu-restart-services \
 	debian-edu-test-install \
 	debian-edu-update-netblock \
-	snakeoil-on-ice 
+	snakeoil-on-ice \
+	update-hostname-from-ip
 
 INSTALL     = install -D -p -m 755
 INSTALL_DATA= install -D -p -m 644

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-06 10:40:31 UTC (rev 81395)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-06 11:20:26 UTC (rev 81396)
@@ -4,6 +4,9 @@
   * Adjust network setup for Standalone and Roaming-Workstation to
     work with Network Manager in Wheezy, which ignore all interfaces
     listed in /etc/network/interfaces.
+  * Reintroduce /usr/sbin/update-hostname-from-ip which was dropped in
+    r73306 and r73313, to make sure machines get their hostname set
+    from DNS during installation.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 06 Jul 2013 12:20:36 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel	2013-07-06 10:40:31 UTC (rev 81395)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/pre-pkgsel	2013-07-06 11:20:26 UTC (rev 81396)
@@ -183,10 +183,8 @@
     # installing main-server.
     if echo $PROFILE | grep -q Main-Server ; then
 	:
-    elif [ -x /etc/init.d/update-hostname ] ; then
-        # FIXME: /etc/init.d/update-hostname has been removed! 
-        # Let's see how far we get without.
-	in-target /etc/init.d/update-hostname start || true
+    elif [ -x /target/usr/sbin/update-hostname-from-ip ] ; then
+	in-target /usr/sbin/update-hostname-from-ip || true
     fi
 
     # Avoid hardcoding entries on the clients, to make sure IP address