xenserver: Clear stale configuration keys on boot

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index c5659e0d04fdf8e9c6964ea40ddb0146bd321c26..28a013ff069a472d45b8a4f12ccb490a95835dcc 100755 (executable)
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -268,6 +268,12 @@ function start {
     if [ ! -e "$VSWITCHD_CONF" ]; then
         warning "$VSWITCHD_CONF does not exist"
         action "Creating empty $VSWITCHD_CONF" touch "$VSWITCHD_CONF"
+    else
+       /usr/bin/ovs-cfg-mod '-vANY:console:emer' -F "$VSWITCHD_CONF" \
+           '--del-match=bridge.*' \
+           '--del-match=port.*' \
+           '--del-match=bonding.*' \
+           '--del-match=iface.*'
     fi
 
     start_vswitchd