X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=rhel%2Fetc_init.d_openvswitch;h=af332c0b577967893600d9d6b202c02d145195e0;hb=70cf679a5a8307f1bae268fcc67741d446990f9c;hp=6f7fe6955ec0d5e9c3ef46180f64bed5b2188f93;hpb=a281173e19918379832ec535b18aa2af58832efb;p=openvswitch

diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index 6f7fe695..af332c0b 100755
--- 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
 
-# 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.
@@ -27,13 +27,10 @@
 # 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 () {
-    # 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
@@ -48,8 +45,14 @@ start () {
     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
     "$@"
 
+    $ovs_ctl --protocol=gre enable-protocol
+
     touch /var/lock/subsys/openvswitch
 }
 
@@ -58,6 +61,15 @@ stop () {
     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)
@@ -67,8 +79,8 @@ case $1 in
         stop
         ;;
     restart)
-        stop
-        start
+        shift
+        restart "$@"
         ;;
     reload|force-reload)
         # Nothing to do.