[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.11-7-gcdf9d5c

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit cdf9d5cc2a985c397f46ac314f048c8123f05b64
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun May 26 18:40:45 2013 +0200

    Improve handling of unknown machines that do not provide a hostname.

diff --git a/fai/config/scripts/FAISERVER/40-dhcp b/fai/config/scripts/FAISERVER/40-dhcp
index cd978ff..e8b0750 100755
--- a/fai/config/scripts/FAISERVER/40-dhcp
+++ b/fai/config/scripts/FAISERVER/40-dhcp
@@ -96,7 +96,10 @@ subnet ${SUBNET} netmask ${NETMASK} {
       allow unknown-clients;
       max-lease-time 7200;
       range ${RANGE};
-      option host-name = concat("guest",suffix(binary-to-ascii(10,8,".",suffix(leased-address,1)),2));
+      if not exists host-name {
+         option host-name = concat("guest",suffix(binary-to-ascii(10,8,".",suffix(leased-address,1)),2));
+         ddns-hostname = config-option host-name;
+      }
    }
 }
 

-- 
Debian-LAN development and packaging