Changeset 13599 in genesis

Timestamp:

Aug 9, 2016, 12:03:29 PM (8 years ago)

Author:

rick

Message:

Typo ether and inet have a different syntax

File:

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

tools/gformat.py

@@ -935 +935 @@
       )
 
+    idx_offset = 0
     if iface == 'bridge0':
       output += "cloned_interfaces='bridge0'\n"
@@ -942 +943 @@
     else:
       if flags_if[iface].has_key('ether'):
-        output += "ifconfig_%s='ether %s inet %s'\n" % (iface, flags_if[iface]['ether'], addrs[0][0])
-      else:
-        output += "ifconfig_%s='inet %s'\n" % (iface, addrs[0][0])
+        output += "ifconfig_%s='link %s'\n" % (iface, flags_if[iface]['ether'])
+        output += "ifconfig_%s_alias0='inet %s'\n" % (iface, addrs[0][0])
+        idx_offset += 1
+      else:   
+        output += "ifconfig_%s=inet %s'\n" % (iface, addrs[0][0])
+        
     for idx, addr in enumerate(addrs[1:]):
-      output += "ifconfig_%s_alias%s='inet %s'\n" % (iface, idx, addr[0]) 
+      output += "ifconfig_%s_alias%s='inet %s'\n" % (iface, idx + idx_offset, addr[0]) 
     if iface == 'bridge0':
       for dhcp_iface in datadump['autogen_dhcp_interfaces']: