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
classifier: Use array for subtables instead of a list.
[sliver-openvswitch.git]
/
rhel
/
etc_init.d_openvswitch
diff --git
a/rhel/etc_init.d_openvswitch
b/rhel/etc_init.d_openvswitch
index
ad7579c
..
2878d39
100755
(executable)
--- a/
rhel/etc_init.d_openvswitch
+++ b/
rhel/etc_init.d_openvswitch
@@
-5,7
+5,7
@@
# chkconfig: 2345 09 91
# description: Manage Open vSwitch kernel modules and user-space daemons
# chkconfig: 2345 09 91
# description: Manage Open vSwitch kernel modules and user-space daemons
-# Copyright (C) 2009, 2010, 2011 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011
, 2013
Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-31,7
+31,7
@@
test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
start () {
test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
start () {
- set
$
ovs_ctl ${1-start}
+ set ovs_ctl ${1-start}
set "$@" --system-id=random
if test X"$FORCE_COREFILES" != X; then
set "$@" --force-corefiles="$FORCE_COREFILES"
set "$@" --system-id=random
if test X"$FORCE_COREFILES" != X; then
set "$@" --force-corefiles="$FORCE_COREFILES"
@@
-45,23
+45,26
@@
start () {
if test X"$VSWITCHD_MLOCKALL" != X; then
set "$@" --mlockall="$VSWITCHD_MLOCKALL"
fi
if test X"$VSWITCHD_MLOCKALL" != X; then
set "$@" --mlockall="$VSWITCHD_MLOCKALL"
fi
- if test X"$BRCOMPAT" = Xyes; then
- set "$@" --brcompat
- fi
set "$@" $OVS_CTL_OPTS
"$@"
set "$@" $OVS_CTL_OPTS
"$@"
- $ovs_ctl --protocol=gre enable-protocol
-
touch /var/lock/subsys/openvswitch
}
stop () {
touch /var/lock/subsys/openvswitch
}
stop () {
-
$
ovs_ctl stop
+ ovs_ctl stop
rm -f /var/lock/subsys/openvswitch
}
rm -f /var/lock/subsys/openvswitch
}
-ovs_ctl=/usr/share/openvswitch/scripts/ovs-ctl
+restart () {
+ if [ "$1" = "--save-flows=yes" ]; then
+ start restart
+ else
+ stop
+ start
+ fi
+}
+
case $1 in
start)
start
case $1 in
start)
start
@@
-70,17
+73,18
@@
case $1 in
stop
;;
restart)
stop
;;
restart)
- s
top
- start
+ s
hift
+ restart "$@"
;;
reload|force-reload)
# Nothing to do.
;;
status)
;;
reload|force-reload)
# Nothing to do.
;;
status)
- $ovs_ctl status
+ ovs_ctl status
+ exit $?
;;
version)
;;
version)
-
$
ovs_ctl version
+ ovs_ctl version
;;
force-reload-kmod)
start force-reload-kmod
;;
force-reload-kmod)
start force-reload-kmod