projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lacp: Implement custom timing mode.
[openvswitch]
/
xenserver
/
etc_init.d_openvswitch
diff --git
a/xenserver/etc_init.d_openvswitch
b/xenserver/etc_init.d_openvswitch
index 73009813476d65c3c07fac29c9c40ba69093984a..dfd8c39a62eda8722fca976a3d27d7f9e2fea214 100755
(executable)
--- a/
xenserver/etc_init.d_openvswitch
+++ b/
xenserver/etc_init.d_openvswitch
@@
-109,6
+109,8
@@
esac
: ${VSWITCHD_VALGRIND_LOG:=}
: ${VSWITCHD_VALGRIND_OPT:=}
: ${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"
# 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"
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
}
rm -f /var/lock/subsys/openvswitch
}