X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fetc_init.d_openvswitch;h=dfd8c39a62eda8722fca976a3d27d7f9e2fea214;hb=1b137691320fbf0d1e545a146495d8988cd62200;hp=73009813476d65c3c07fac29c9c40ba69093984a;hpb=c5f341ab193b9126dffef8c77bf8ed35e91290fd;p=openvswitch diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index 73009813..dfd8c39a 100755 --- a/xenserver/etc_init.d_openvswitch +++ b/xenserver/etc_init.d_openvswitch @@ -109,6 +109,8 @@ esac : ${VSWITCHD_VALGRIND_LOG:=} : ${VSWITCHD_VALGRIND_OPT:=} +: ${OVS_XAPI_SYNC_PIDFILE:=/var/run/openvswitch/ovs-xapi-sync.pid} + # Full paths to executables & modules ovsdb_server="/usr/sbin/ovsdb-server" ovsdb_tool="/usr/bin/ovsdb-tool" @@ -382,9 +384,7 @@ function start { function stop { stop_daemon VSWITCHD "$vswitchd" stop_daemon OVSDB_SERVER "$ovsdb_server" - if [ -e /var/run/openvswitch/ovs-xapi-sync.pid ]; then - kill `cat /var/run/openvswitch/ovs-xapi-sync.pid` - fi + stop_daemon OVS_XAPI_SYNC ovs-xapi-sync rm -f /var/lock/subsys/openvswitch }