From 84ebca39ef841949d78ce4266673aa590801b200 Mon Sep 17 00:00:00 2001
From: Marco Yuen <marcoy@gmail.com>
Date: Fri, 8 Jul 2011 20:17:05 -0400
Subject: [PATCH] GENICLOUD-31 Remove duplicate entries from the bridged
 interface.

---
 plnet.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/plnet.py b/plnet.py
index 001bbee..0f692f4 100755
--- a/plnet.py
+++ b/plnet.py
@@ -157,9 +157,8 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
             elif orig_ifname:
                 ifname = orig_ifname
                 device_id -= 1
-            if 'PRIMARY' in details: del details['PRIMARY']
             logger.log('net:InitInterfaces: Bridge detected. Adding %s to devices_map' % ifname)
-            devices_map[ifname] = details
+            devices_map[ifname] = removeBridgedIfaceDetails(details)
             bridgeName = details['BRIDGE']
 
             logger.log('net:InitInterfaces: Adding bridge %s' % bridgeName)
@@ -422,6 +421,16 @@ def prepDetails(interface, hostname=''):
 
     return details
 
+##
+# Remove duplicate entry from the bridged interface's configuration file.
+#
+def removeBridgedIfaceDetails(details):
+    for key in [ 'PRIMARY', 'PERSISTENT_DHCLIENT', 'DHCLIENTARGS', 'DHCP_HOSTNAME',
+                 'BOOTPROTO', 'IPADDR', 'NETMASK', 'GATEWAY', 'DNS1', 'DNS2' ]:
+        if key in details:
+            del details[key]
+    return details
+
 if __name__ == "__main__":
     import optparse
     import sys
-- 
2.43.0