Changeset 10368 in genesis for tools

Timestamp:

Apr 7, 2012, 10:22:52 AM (13 years ago)

Author:

rick

Message:

Make sure to use FQDN as fullname for DHCP to avoid problems with equally named
devices (like proxyFoo en nodeFoo).

File:

• tools/gformat.py (modified) (3 diffs)

tools/gformat.py

@@ -297 +297 @@
   """ Generate configuration file '/usr/local/etc/dnsmasq.conf' """
   output = generate_header()
-  output += """\
+  output += Template("""\
 # DHCP server options
 dhcp-authoritative
 dhcp-fqdn
-domain=dhcp.%(autogen_nodename_lower)s.%(autogen_domain)s
+domain=dhcp.{{ autogen_fqdn }}.{{ autogen_domain }}
 domain-needed
 expand-hosts
@@ -308 +308 @@
 # Low memory footprint
 cache-size=10000
-  \n""" % datadump
+
+\n""").render(datadump)
 
   for iface_key in datadump['autogen_iface_keys']:
@@ -520 +521 @@
 
   datadump['autogen_domain'] = datadump['domain'] if datadump.has_key('domain') else 'wleiden.net'
-  datadump['autogen_nodename_lower'] = datadump['nodename'].lower()
   return datadump