ovs-vsctl: Set timeout to a default value of five seconds

[openvswitch] / debian / openvswitch-switch.init

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index ece07a83ea74c82ca4a60806f98b8a443f533de4..dd4bb05965bfd14dea8de92d84518687db6032b3 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -220,7 +220,7 @@ case "$1" in
                 configure_ssl
                 ;;
             *)
-                echo "$default: CONTROLLER must be in the form 'ssl:HOST[:PORT]' or 'tcp:HOST[:PORT]' when not in discovery mode" >&2
+                echo "$default: CONTROLLER must be in the form 'ssl:IP[:PORT]' or 'tcp:IP[:PORT]' when not in discovery mode" >&2
                 echo "Run ovs-switch-setup (in the openvswitch-switch-config package) or edit /etc/default/openvswitch-switch to configure" >&2
                 exit 1
         esac
@@ -261,6 +261,18 @@ case "$1" in
             exit 1
         fi
 
+        echo -n "Loading ip_gre_mod: "
+        if grep -q '^ip_gre$' /proc/modules; then
+            modprobe -r ip_gre
+        fi
+        if grep -q '^ip_gre_mod$' /proc/modules; then
+            echo "already loaded, nothing to do."
+        elif modprobe ip_gre_mod; then
+            echo "success."
+        else
+            echo "could not find module."
+        fi
+
         for netdev in $NETDEVS; do
             check_op "Removing IP address from $netdev" ifconfig $netdev 0.0.0.0
         done
@@ -386,6 +398,10 @@ case "$1" in
        echo "$NAME."
 
         check_op "Deleting datapath" ovs-dpctl del-dp of0
+        echo -n "Unloading ip_gre module: "
+        if modprobe -r ip_gre_mod; then
+            echo "success."
+        fi
         check_op "Unloading kernel module" modprobe -r openvswitch_mod
        ;;
     force-stop)