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

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-07-02 10:29:02 +0000 (Tue, 02 Jul 2013)
New Revision: 81298

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp
Log:
* ldap-tools/sitesummary2ldapdhcp:
  - Fix configuration for 'netdevices'.
  - Modify help message to fit the code after last cleanup.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 10:05:10 UTC (rev 81297)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 10:29:02 UTC (rev 81298)
@@ -1,3 +1,11 @@
+debian-edu-config (1.708~svn81) UNRELEASED; urgency=low
+
+  * ldap-tools/sitesummary2ldapdhcp:
+    - Fix configuration for 'netdevices'.
+    - Modify help message to fit the code after last cleanup.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 02 Jul 2013 12:23:22 +0200
+
 debian-edu-config (1.708~svn81297) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp
===================================================================
--- branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp	2013-07-02 10:05:10 UTC (rev 81297)
+++ branches/wheezy/debian-edu-config/ldap-tools/sitesummary2ldapdhcp	2013-07-02 10:29:02 UTC (rev 81298)
@@ -42,8 +42,7 @@
  -i ID          Handle host with the given sitesummary ID only.
  -u userfilter  Filter used to find LDAP user used to update LDAP.
  -t TYPE        Specify type of system(s) to add. TYPE can be: servers,
-                workstations, terminals or printers. If -t is omitted,
-                added systems will be of type netdevices.
+                workstations, terminals, netdevices or printers.
 EOF
 
     exit $retval;
@@ -210,10 +209,10 @@
                 ];
         } elsif ($opts{t} eq 'netdevices') {
             $attr = [
-                'objectClass'    => 'dhcpHost',
+                'objectClass'    => ['top', 'device', 'ipHost', 'ieee802Device'],
                 'cn'             => $hostname,
-                'dhcpHWAddress'  => "ethernet $mac",
-                'dhcpStatements' => "fixed-address $fqdn"
+                'macAddress'     => $mac,
+                'ipHostNumber'   => $ipaddr,
                 ];
         }
         if ($attr) {