Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10881)
+++ /tools/gformat.py	(revision 10882)
@@ -429,21 +429,21 @@
 
     (addr, mask) = datadump[iface_key]['ip'].split('/')
-    datadump[iface_key]['addr'] = addr
-    datadump[iface_key]['netmask'] = cidr2netmask(mask)
-    datadump[iface_key]['subnet'] = get_network(addr, mask)
+    datadump[iface_key]['autogen_addr'] = addr
+    datadump[iface_key]['autogen_netmask'] = cidr2netmask(mask)
+    datadump[iface_key]['autogen_subnet'] = get_network(addr, mask)
     try:
       (dhcp_start, dhcp_stop) = datadump[iface_key]['dhcp'].split('-')
     except (AttributeError, ValueError, KeyError):
-      dhcp_out[ifname].append("  subnet %(subnet)s netmask %(netmask)s {\n    ### not autoritive\n  }\n" % datadump[iface_key])
+      dhcp_out[ifname].append("  subnet %(autogen_subnet)s netmask %(autogen_netmask)s {\n    ### not autoritive\n  }\n" % datadump[iface_key])
       continue
 
     dhcp_part = ".".join(addr.split('.')[0:3])
-    datadump[iface_key]['dhcp_start'] = dhcp_part + "." + dhcp_start
-    datadump[iface_key]['dhcp_stop'] =  dhcp_part + "." + dhcp_stop
+    datadump[iface_key]['autogen_dhcp_start'] = dhcp_part + "." + dhcp_start
+    datadump[iface_key]['autogen_dhcp_stop'] =  dhcp_part + "." + dhcp_stop
     dhcp_out[ifname].append("""\
-   subnet %(subnet)s netmask %(netmask)s {
-     range %(dhcp_start)s %(dhcp_stop)s;
-     option routers %(addr)s;
-     option domain-name-servers %(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])
@@ -480,5 +480,5 @@
       (dhcp_start, dhcp_stop) = datadump[iface_key]['dhcp'].split('-')
       (ip, cidr) = datadump[iface_key]['ip'].split('/')
-      datadump[iface_key]['netmask'] = cidr2netmask(cidr)
+      datadump[iface_key]['autogen_netmask'] = cidr2netmask(cidr)
     except (AttributeError, ValueError, KeyError):
       output += "# not autoritive\n\n"
@@ -486,7 +486,7 @@
 
     dhcp_part = ".".join(ip.split('.')[0:3])
-    datadump[iface_key]['dhcp_start'] = dhcp_part + "." + dhcp_start
-    datadump[iface_key]['dhcp_stop'] =  dhcp_part + "." + dhcp_stop
-    output += "dhcp-range=%(interface)s,%(dhcp_start)s,%(dhcp_stop)s,%(netmask)s,24h\n\n" % datadump[iface_key]
+    datadump[iface_key]['autogen_dhcp_start'] = dhcp_part + "." + dhcp_start
+    datadump[iface_key]['autogen_dhcp_stop'] =  dhcp_part + "." + dhcp_stop
+    output += "dhcp-range=%(interface)s,%(autogen_dhcp_start)s,%(autogen_dhcp_stop)s,%(autogen_netmask)s,24h\n\n" % datadump[iface_key]
 
   return output
@@ -695,7 +695,7 @@
     if ifacedump['type'] in ['11a', '11b', '11g', 'wireless']:
       # Default to station (client) mode
-      ifacedump['wlanmode'] = "sta"
+      ifacedump['autogen_wlanmode'] = "sta"
       if ifacedump['mode'] in ['master', 'master-wds', 'ap', 'ap-wds']:
-        ifacedump['wlanmode'] = "ap"
+        ifacedump['autogen_wlanmode'] = "ap"
       # Default to 802.11b mode
       ifacedump['mode'] = '11b'
@@ -711,9 +711,12 @@
       # Allow special hacks at the back like wds and stuff
       if not ifacedump.has_key('extra'):
-        ifacedump['extra'] = 'regdomain ETSI country NL'
+        ifacedump['autogen_extra'] = 'regdomain ETSI country NL'
+      else:
+        ifacedump['autogen_extra'] = ifacedump['extra']
+        
 
       output += "wlans_%(interface)s='%(autogen_ifname)s'\n" % ifacedump
-      output += ("create_args_%(autogen_ifname)s='wlanmode %(wlanmode)s mode " +\
-        "%(mode)s ssid %(ssid)s %(extra)s channel %(channel)s'\n") % ifacedump
+      output += ("create_args_%(autogen_ifname)s='wlanmode %(autogen_wlanmode)s mode " +\
+        "%(mode)s ssid %(ssid)s %(autogen_extra)s channel %(channel)s'\n") % ifacedump
 
     elif ifacedump['type'] in ['ethernet', 'eth']:
@@ -1131,5 +1134,5 @@
       try:
         (dhcp_start, dhcp_stop) = datadump[iface_key]['dhcp'].split('-')
-        datadump[iface_key]['netmask'] = cidr2netmask(cidr)
+        datadump[iface_key]['autogen_netmask'] = cidr2netmask(cidr)
         dhcp_part = ".".join(ip.split('.')[0:3])
         if ip != datadump['masterip']:
@@ -1502,4 +1505,11 @@
             if not datadump[iface_key].has_key('comment'):
               datadump[iface_key]['comment'] = 'autogen-FIXME'
+
+            if datadump[iface_key]['comment'].startswith('autogen-') and datadump[iface_key].has_key('comment'):
+              datadump[iface_key]['comment'] = datadump[iface_key]['desc']
+
+            if datadump[iface_key].has_key('desc') and datadump[iface_key]['comment'] == datadump[iface_key]['desc']:
+              del datadump[iface_key]['desc']
+
             # Set the compass value based on the angle between the poels
             if datadump[iface_key].has_key('ns_ip'):