From 378e1f9854e5bee378ff05a26906a45d1673ab7a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 30 Sep 2009 11:57:23 +0100
Subject: [PATCH] xenserver: Clear stale configuration keys on boot

---
 xenserver/etc_init.d_vswitch | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index c5659e0d0..28a013ff0 100755
--- 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
-- 
2.43.0