X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=rhel%2Fetc_init.d_openvswitch;h=ad7579cd2751fa9bc0712be3680f94ad4b6fd6dd;hb=be812f2d2b0c948e5f52017c4df79645809fcb90;hp=c7543cc5517be88d5e30f0f3a37c6fad53071462;hpb=c434706a374bd44d1274e7bdbee40067a6620b61;p=openvswitch

diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index c7543cc5..ad7579cd 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,12 +45,14 @@ start () {
     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
+    if test X"$BRCOMPAT" = Xyes; then
+	set "$@" --brcompat
     fi
+    set "$@" $OVS_CTL_OPTS
     "$@"
 
+    $ovs_ctl --protocol=gre enable-protocol
+
     touch /var/lock/subsys/openvswitch
 }