From: Ben Pfaff <blp@nicira.com>
Date: Thu, 1 Oct 2009 16:52:27 +0000 (-0700)
Subject: xenserver: Clear stale configuration keys on boot, but not on later starts
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f3879d205ab0df085c6d2ec13a39ee5d8b6242c;hp=e1563fefb20a0194a5ba46f87045763622f89bb3;p=openvswitch

xenserver: Clear stale configuration keys on boot, but not on later starts
---

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 637718d7..9e0efe07 100755
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -264,7 +264,8 @@ function start {
     if [ ! -e "$VSWITCHD_CONF" ]; then
         warning "$VSWITCHD_CONF does not exist"
         action "Creating empty $VSWITCHD_CONF" touch "$VSWITCHD_CONF"
-    else
+    elif [ ! -e /var/run/vswitch.booted ]; then
+        touch /var/run/vswitch.booted
 	/usr/bin/ovs-cfg-mod '-vANY:console:emer' -F "$VSWITCHD_CONF" \
 	    '--del-match=bridge.*' \
 	    '--del-match=port.*' \