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 637718d702258e191333bf8412427e5287eea837..9e0efe0729fc9af6bd40813941058da466dd4803 100755 (executable)
--- 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.*' \