[debian-edu-commits] r82661 - in branches/wheezy/debian-edu-config: debian ldap-tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-11-21 20:49:34 +0000 (Thu, 21 Nov 2013)
New Revision: 82661

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp
Log:
Adjust sitesummary2ldapdhcp to trim trailing newline from DNS names generated by update-hostname-from-ip.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-11-08 09:25:28 UTC (rev 82660)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-11-21 20:49:34 UTC (rev 82661)
@@ -3,6 +3,8 @@
   * Improve error message from sitesummary2ldapdhcp when serveral host
     LDAP objects have the same MAC address, to make the problem easier
     to debug.
+  * Adjust sitesummary2ldapdhcp to trim trailing newline from DNS
+    names generated by update-hostname-from-ip.
   * Make debian-edu-bless more robust on flaky networks, by trying
     several times to download packages while installing.
 

Modified: branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp
===================================================================
--- branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp	2013-11-08 09:25:28 UTC (rev 82660)
+++ branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp	2013-11-21 20:49:34 UTC (rev 82661)
@@ -92,6 +92,7 @@
         my $mac = get_primary_ether_hwaddr($macref);
         # Use -I 127.0.0.1 to disable DNS lookup
         $fqdn=`/usr/sbin/update-hostname-from-ip -m -I 127.0.0.1 -M $mac -n`;
+        chomp $fqdn;
         print "info: Create GOsa machine for $fqdn [$ipaddr] id $hostid.\n";
         $hostinfo{$hostid} = [$fqdn, $ipaddr, $macref, 0];
     } else {