X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Fopenvswitch-switch.init;h=d84c1b671ca0adce99295cc7fa5ca906c97d10bf;hb=46528f78e5c0b7484e1735bb774ef2ad92e04593;hp=44ec67c0bbf3b513e958fd0e765c39b937cd579c;hpb=43bb5f82ec051f335a5c5a8975150ec6352d5d73;p=sliver-openvswitch.git

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 44ec67c0b..d84c1b671 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2011 Nicira Networks, Inc.
+# Copyright (C) 2011, 2012 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,42 +21,96 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Open vSwitch switch
+# Description:       openvswitch-switch provides the userspace components and utilities for
+#                    the Open vSwitch kernel-based 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
 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-oorefiles="$FORCE_COREFILES"
+network_interfaces () {
+    INTERFACES="/etc/network/interfaces"
+    [ -e "${INTERFACES}" ] || return
+    bridges=`awk '{ if ($1 == "allow-ovs") { print $2; } }' "${INTERFACES}"`
+    [ -n "${bridges}" ] && $1 --allow=ovs ${bridges}
+}
+
+load_kmod () {
+    ovs_ctl load-kmod || exit $?
+}
+
+start () {
+    if ovs_ctl load-kmod; then
+	:
+    else
+	echo "Module has probably not been built for this kernel."
+	if ! test -d /usr/share/doc/openvswitch-datapath-source; then
+	    echo "Install the openvswitch-datapath-source package, then read"
+	else
+            echo "For instructions, read"
 	fi
+	echo "/usr/share/doc/openvswitch-datapath-source/README.Debian"
 
-	# Allow GRE traffic.
-        test ! -x /sbin/iptables || /sbin/iptables -I INPUT -p gre -j ACCEPT
+	if test X"$OVS_MISSING_KMOD_OK" = Xyes; then
+	    # We're being invoked by the package postinst.  Do not
+	    # fail package installation just because the kernel module
+	    # is not available.
+	    exit 0
+	fi
+    fi
+    set ovs_ctl ${1-start} --system-id=random
+    if test X"$FORCE_COREFILES" != X; then
+	set "$@" --force-corefiles="$FORCE_COREFILES"
+    fi
+    set "$@" $OVS_CTL_OPTS
+    "$@" || exit $?
+    [ "$2" = "start" ] && network_interfaces ifup
+}
 
-	"$@"
-        ;;
+stop () {
+    network_interfaces ifdown
+    ovs_ctl stop
+}
+
+restart () {
+    # OVS_RESTART_SAVE_FLOWS can be set by package postinst script.
+    if [ "$OVS_RESTART_SAVE_FLOWS" = "yes" ] || \
+       [ "$1" = "--save-flows=yes" ]; then
+        start restart
+    else
+        stop
+        start
+    fi
+}
+
+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
+        shift
+        restart "$@"
         ;;
     status)
-        $ovs_ctl status
+        ovs_ctl status
+        exit $?
+        ;;
+    force-reload-kmod)
+        start force-reload-kmod
+        ;;
+    load-kmod)
+        load_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|load-kmod}" >&2
         exit 1
         ;;
 esac