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
openvswitch: Remove Linux bridge compatibility.
[sliver-openvswitch.git]
/
rhel
/
etc_init.d_openvswitch
diff --git
a/rhel/etc_init.d_openvswitch
b/rhel/etc_init.d_openvswitch
index
c7543cc
..
a25e624
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
Networks
, Inc.
+# Copyright (C) 2009, 2010, 2011 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.
@@
-27,13
+27,10
@@
# Short-Description: Open vSwitch switch
### END INIT INFO
# Short-Description: Open vSwitch switch
### END INIT INFO
-. /usr/share/openvswitch/scripts/ovs-lib
.sh
|| exit 1
+. /usr/share/openvswitch/scripts/ovs-lib || exit 1
test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
start () {
test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
start () {
- # Allow GRE traffic.
- /sbin/iptables -I INPUT -p gre -j ACCEPT
-
set $ovs_ctl ${1-start}
set "$@" --system-id=random
if test X"$FORCE_COREFILES" != X; then
set $ovs_ctl ${1-start}
set "$@" --system-id=random
if test X"$FORCE_COREFILES" != X; then
@@
-48,12
+45,11
@@
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 ! -e /var/run/openvswitch.booted; then
- touch /var/run/openvswitch.booted
- set "$@" --delete-bridges
- fi
+ set "$@" $OVS_CTL_OPTS
"$@"
"$@"
+ $ovs_ctl --protocol=gre enable-protocol
+
touch /var/lock/subsys/openvswitch
}
touch /var/lock/subsys/openvswitch
}
@@
-62,6
+58,15
@@
stop () {
rm -f /var/lock/subsys/openvswitch
}
rm -f /var/lock/subsys/openvswitch
}
+restart () {
+ if [ "$1" = "--save-flows=yes" ]; then
+ 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)
@@
-71,8
+76,8
@@
case $1 in
stop
;;
restart)
stop
;;
restart)
- s
top
- start
+ s
hift
+ restart "$@"
;;
reload|force-reload)
# Nothing to do.
;;
reload|force-reload)
# Nothing to do.