Changeset 11739 in genesis

Timestamp:

Feb 14, 2013, 9:56:21 AM (12 years ago)

Author:

rick

Message:

Grumble aliases on DHCP interfaces proved to be a interesting challenge.

File:

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

tools/gformat.py

@@ -587 +587 @@
 
     # Flag dhclient is possible
-    if not dhclient_if[ifname]:
+    if not dhclient_if.has_key(ifname) or dhclient_if[ifname] == False:
       dhclient_if[ifname] = dhcp_type(ifacedump) == DHCP_CLIENT
 
@@ -824 +824 @@
     if dhclient_if[iface]:
       output += "ifconfig_%s='SYNCDHCP'\n\n" % (iface)
-    else:
-      # Make sure the external address is always first as this is needed in the
-      # firewall setup
-      addrs = sorted(addrs,key=lambda x: x[0].split('.')[0], cmp=lambda x,y: cmp(1 if x == '172' else 0, 1 if y == '172' else 0))
-      output += "ipv4_addrs_%s='%s'\n\n" % (iface, " ".join([x[0] for x in addrs]))
+    
+    # Make sure the external address is always first as this is needed in the
+    # firewall setup
+    addrs = sorted(
+        [x for x in addrs if not '0.0.0.0' in x[0]],
+        key=lambda x: x[0].split('.')[0], 
+        cmp=lambda x,y: cmp(1 if x == '172' else 0, 1 if y == '172' else 0)
+      )
+    addr_str = " ".join([x[0] for x in addrs])
+    output += "ipv4_addrs_%s='%s'\n\n" % (iface, addr_str)
 
   rc_conf_local_cache[datadump['autogen_item']] = output