brcomapt: Delete VLANs and bonding entries for deleted ports.

Otherwise these entries can hang around past reboot and cause trouble
later as vif numbers are reused.

Probably another part of the full solution is to delete the whole
configuration file on reboot.

Bug #1216.

diff --git a/vswitchd/brcompatd.c b/vswitchd/brcompatd.c
index 5fa0fd974566842e1b5976b9a01e91c5342caf1b..6054bb46d50ff0c66c70256ffc3099ef9d4a601c 100644 (file)
--- a/vswitchd/brcompatd.c
+++ b/vswitchd/brcompatd.c
@@ -299,6 +299,8 @@ modify_config(const char *br_name, const char *port_name, enum bmc_action act)
 
     case BMC_DEL_PORT: 
         cfg_del_entry("bridge.%s.port=%s", br_name, port_name);
+        cfg_del_match("bonding.*.slave=%s", port_name);
+        cfg_del_match("vlan.%s.*", port_name);
         break;
     }