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 28a013ff069a472d45b8a4f12ccb490a95835dcc..249adeb0737774a72af0036ac614f65c5337e100 100755 (executable)
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -268,7 +268,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.*' \