Changeset 10366 in genesis

Timestamp:

Apr 7, 2012, 10:08:14 AM (13 years ago)

Author:

rick

Message:

DHCLIENT configuration done the proper way...

File:

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

tools/gformat.py

@@ -410 +410 @@
   addrs_list = { 'lo0' : [("127.0.0.1/8", "LocalHost"), ("172.31.255.1/32","Proxy IP")] }
   iface_map = {'lo0' : 'lo0'}
+  dhclient_if = {'lo0' : False}
 
   masterip_used = False
@@ -423 +424 @@
     ifname = ifacedump['autogen_ifname']
 
-    # Write DHCLIENT entry
-    if ifacedump.has_key('dhcpclient') and ifacedump['dhcpclient']:
-      output += "ifconfig_%s='SYNCDHCP'" % ifacedump['autogen_ifname']
+    # Flag dhclient is possible
+    dhclient_if[ifname] = ifacedump.has_key('dhcpclient') and ifacedump['dhcpclient']
 
     # Add interface IP to list
@@ -475 +475 @@
     for addr, comment in sorted(addrs,key=lambda x: parseaddr(x[0].split('/')[0])):
       output += "# %s || %s || %s\n" % (iface, addr, comment)
-    output += "ipv4_addrs_%s='%s'\n\n" % (iface, " ".join([x[0] for x in addrs]))
+
+    # Write DHCLIENT entry
+    if dhclient_if[iface]:
+      output += "ifconfig_%s='SYNCDHCP'\n\n" % (iface)
+    else:
+      output += "ipv4_addrs_%s='%s'\n\n" % (iface, " ".join([x[0] for x in addrs]))
 
   return output