X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fetc_init.d_vswitch;h=637718d702258e191333bf8412427e5287eea837;hb=e1563fefb20a0194a5ba46f87045763622f89bb3;hp=8f0adf79797bdd783764ef35be846ad8ade1ad8b;hpb=39fb08818bbd9c438dbf23caa89937c663451b5a;p=openvswitch

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 8f0adf79..637718d7 100755
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -264,16 +264,24 @@ 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
     start_brcompatd
     reload_vswitchd  # ensures ovs-vswitchd has fully read config file.
+    touch /var/lock/subsys/vswitch
 }
 
 function stop {
     stop_brcompatd
     stop_vswitchd
+    rm -f /var/lock/subsys/vswitch
 }
 
 function restart {