git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
xenserver
/
etc_init.d_openvswitch
diff --git
a/xenserver/etc_init.d_openvswitch
b/xenserver/etc_init.d_openvswitch
index
b2248b7
..
534451b
100755
(executable)
--- a/
xenserver/etc_init.d_openvswitch
+++ b/
xenserver/etc_init.d_openvswitch
@@
-76,6
+76,7
@@
start () {
touch /var/run/openvswitch.booted
set "$@" --delete-bridges
fi
touch /var/run/openvswitch.booted
set "$@" --delete-bridges
fi
+ set "$@" $OVS_CTL_OPTS
"$@"
start_ovs_xapi_sync
"$@"
start_ovs_xapi_sync
@@
-106,6
+107,16
@@
stop () {
rm -f /var/lock/subsys/openvswitch
}
rm -f /var/lock/subsys/openvswitch
}
+restart () {
+ if [ "$1" = "--save-flows=yes" ]; then
+ stop_daemon ovs-xapi-sync
+ start restart
+ else
+ stop
+ start
+ fi
+}
+
ovs_ctl=/usr/share/openvswitch/scripts/ovs-ctl
case $1 in
start)
ovs_ctl=/usr/share/openvswitch/scripts/ovs-ctl
case $1 in
start)
@@
-115,8
+126,8
@@
case $1 in
stop
;;
restart)
stop
;;
restart)
- s
top
- start
+ s
hift
+ restart "$@"
;;
reload|force-reload)
# The main OVS daemons keep up-to-date, but ovs-xapi-sync needs help.
;;
reload|force-reload)
# The main OVS daemons keep up-to-date, but ovs-xapi-sync needs help.