Changeset 13525 in genesis for tools/gformat.py

Timestamp:

Dec 16, 2015, 9:05:56 PM (9 years ago)

Author:

rick

Message:

Convert to autobridge, since addm will fail if interface is missing (like ue0 for example).

While here try to fix spaces in SSIDs

File:

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

tools/gformat.py

@@ -685 +685 @@
         
       output += "wlans_%(autogen_ifbase)s='%(autogen_ifname)s'\n" % ifacedump
-      output += ("create_args_%(autogen_ifname)s='wlanmode %(autogen_wlanmode)s mode " +\
-        "%(type)s ssid \"%(ssid)s\" %(autogen_extra)s channel %(channel)s'\n") % ifacedump
+      output += ("create_args_%(autogen_ifname)s=\"wlanmode %(autogen_wlanmode)s mode " +\
+        "%(type)s ssid \\\"%(ssid)s\\\" %(autogen_extra)s channel %(channel)s\"\n") % ifacedump
       output += "\n"
 
@@ -892 +892 @@
 
   output += "\n"
-  output += "cloned_interfaces='bridge0'\n"
 
   # Details like SSID
@@ -917 +916 @@
 
     if iface == 'bridge0':
-      output += "ifconfig_bridge0='addm %s %s up'\n" % (' addm '.join(datadump['autogen_dhcp_interfaces']), addrs[0][0])
+      output += "cloned_interfaces='bridge0'\n"
+      output += "autobridge_interfaces='bridge0'\n"
+      output += "autobridge_bridge0='%s'\n" % ' '.join(datadump['autogen_dhcp_interfaces'])
+      output += "ifconfig_bridge0='%s up'\n" % addrs[0][0]
     else:
       output += "ifconfig_%s='inet %s'\n" % (iface, addrs[0][0])