utilites: rename ovs-lib.sh to ovs-lib

[sliver-openvswitch.git] / debian / openvswitch-switch.init

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 44ec67c..6f08c3f 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -23,40 +23,78 @@
 # 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
 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"
+if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then
+    BRCOMPAT=no
+    log_warning_msg "ovs-brcompatd missing, disabling bridge compatibility"
+fi
+
+ovs_ctl () {
+    set /usr/share/openvswitch/scripts/ovs-ctl "$@"
+    if test X"$BRCOMPAT" = Xyes; then
+        set "$@" --brcompat
+    fi
+    "$@"
+}
+
+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"
+    fi
+    set ovs_ctl ${1-start} --system-id=random
+    if test X"$FORCE_COREFILES" != X; then
+       set "$@" --force-corefiles="$FORCE_COREFILES"
+    fi
+    "$@" || exit $?
 
-       # Allow GRE traffic.
-        test ! -x /sbin/iptables || /sbin/iptables -I INPUT -p gre -j ACCEPT
+    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
+        ;;
+    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