Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 13421)
+++ tools/gformat.py	(revision 13434)
@@ -516,5 +516,5 @@
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
-    dhcp_out[ifname].append("## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
+    dhcp_out[ifname].append("  ## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
 
     (addr, mask) = datadump[iface_key]['ip'].split('/')
@@ -523,5 +523,5 @@
     datadump[iface_key]['autogen_subnet'] = get_network(addr, mask)
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-      dhcp_out[ifname].append("subnet %(autogen_subnet)s netmask %(autogen_netmask)s {\n  ### not autoritive\n}\n" % \
+      dhcp_out[ifname].append("  subnet %(autogen_subnet)s netmask %(autogen_netmask)s {\n    ### not autoritive\n  }\n" % \
         datadump[iface_key])
       continue
@@ -537,21 +537,21 @@
       for mac in datadump['no_portal']:
         dhcp_out[ifname].append("""\
-host fixed-%(ifname)s-%(fixed)s {
-  hardware ethernet %(mac)s;
-  fixed-address %(prefix)s.%(fixed)s;
-}
+   host fixed-%(ifname)s-%(fixed)s {
+     hardware ethernet %(mac)s;
+     fixed-address %(prefix)s.%(fixed)s;
+   }
 """ % { 'ifname' : ifname, 'mac' : mac, 'prefix': dhcp_part, 'fixed' : fixed })
       fixed += 1
 
     dhcp_out[ifname].append("""\
-subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
-  range %(autogen_dhcp_start)s %(autogen_dhcp_stop)s;
-  option routers %(autogen_addr)s;
-  option domain-name-servers %(autogen_addr)s;
-}
+   subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
+     range %(autogen_dhcp_start)s %(autogen_dhcp_stop)s;
+     option routers %(autogen_addr)s;
+     option domain-name-servers %(autogen_addr)s;
+   }
 """ % datadump[iface_key])
 
   for ifname,value in dhcp_out.iteritems():
-    output += ''.join(value) + '\n\n'
+    output += ("shared-network %s {\n" % ifname) + ''.join(value)  + '}\n\n'
   return output