X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Fopenvswitch-switch.init;h=3487afb4910acf67165f72003936ab9ffaa22637;hb=1f00acd0bccc883f5b2017dc52f8f1d52a089b1f;hp=9c7343b3fc5eb7c082f01122abfa1d545021ae13;hpb=5e77fcd36bb97fe2d98e377720f28619fe1824c8;p=openvswitch

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 9c7343b3..3487afb4 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -23,40 +23,60 @@
 # Short-Description: Open vSwitch switch
 ### END INIT INFO
 
-(test -x /usr/sbin/ovs-vswitchd && test -x /usr/bin/ovsdb-server) || exit 0
-
-set -e
+(test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0
 
+. /usr/share/openvswitch/scripts/ovs-lib.sh
 test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
 
-ovs_ctl=/usr/share/openvswitch/scripts/ovs-ctl
-case $1 in
-    start)
-	set $ovs_ctl start --system-id=random
-	if test X"$FORCE_COREFILES" != X; then
-	    set "$@" --force-corefiles="$FORCE_COREFILES"
-	fi
+if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then
+    BRCOMPAT=no
+    log_warning_msg "ovs-brcompatd missing, disabling bridge compatibility"
+fi
 
-	# Allow GRE traffic.
-        test ! -x /sbin/iptables || /sbin/iptables -I INPUT -p gre -j ACCEPT
+ovs_ctl () {
+    set /usr/share/openvswitch/scripts/ovs-ctl "$@"
+    if test X"$BRCOMPAT" = Xyes; then
+        set "$@" --brcompat
+    fi
+    "$@"
+}
 
-	"$@"
-        ;;
+start () {
+    set ovs_ctl ${1-start} --system-id=random
+    if test X"$FORCE_COREFILES" != X; then
+	set "$@" --force-corefiles="$FORCE_COREFILES"
+    fi
+    "$@" || exit $?
+
+    ovs_ctl --protocol=gre enable-protocol
+}
+
+stop () {
+    ovs_ctl stop
+}
+
+case $1 in
+    start)
+        start
+	;;
     stop | force-stop)
-        $ovs_ctl stop
+        stop
         ;;
     reload | force-reload)
         # The OVS daemons keep up-to-date.
         ;;
     restart)
-        $0 stop || true
-        $0 start
+        stop
+        start
         ;;
     status)
-        $ovs_ctl status
+        ovs_ctl status
+        ;;
+    force-reload-kmod)
+        start force-reload-kmod
         ;;
     *)
-        echo "Usage: $0 {start|stop|restart|force-reload|status|force-stop}" >&2
+        echo "Usage: $0 {start|stop|restart|force-reload|status|force-stop|force-reload-kmod}" >&2
         exit 1
         ;;
 esac