From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 30 Sep 2009 10:57:23 +0000 (+0100)
Subject: xenserver: Clear stale configuration keys on boot
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1563fefb20a0194a5ba46f87045763622f89bb3;p=openvswitch

xenserver: Clear stale configuration keys on boot
---

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index e63a001a..637718d7 100755
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -264,6 +264,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