Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 13567)
+++ /tools/gformat.py	(revision 13568)
@@ -523,5 +523,5 @@
 
     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,5 +533,5 @@
 
     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,4 +569,6 @@
     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"