Changeset 13568 in genesis for tools/gformat.py

Timestamp:

Mar 18, 2016, 10:39:46 PM (9 years ago)

Author:

rick

Message:

Quirk to enable DHCP shared-network again in case an interface has aliases.

Should fix support#65

File:

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

tools/gformat.py

@@ -523 +523 @@
 
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-      dhcp_out[iface_key].append("## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
+      dhcp_out[ifname].append("## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
     else:
       dhcp_out['bridge0'].append("   ## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
@@ -533 +533 @@
 
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-      dhcp_out[iface_key].append(textwrap.dedent("""\
+      dhcp_out[ifname].append(textwrap.dedent("""\
         subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
           ### not autoritive
@@ -569 +569 @@
     if ifname == 'bridge0':
       output += ("shared-network %s {\n" % ifname) + ''.join(value)  + '}\n\n'
+    elif len(value) > 2:
+      output += ("shared-network %s {\n" % ifname) + indent(''.join(value), 2)  + '\n}\n\n'
     else:
       output += ''.join(value) + "\n\n"