X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=debian%2Fopenvswitch-switch.init;h=dd4bb05965bfd14dea8de92d84518687db6032b3;hb=5d9cb63c9160df34d8f282db0e933e3f021f7fb6;hp=b238f72e1409e82b9670bd73c5422b6fb84f58cc;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index b238f72e..dd4bb059 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -19,9 +19,9 @@
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/secchan
-NAME=secchan
-DESC=secchan
+DAEMON=/usr/sbin/ovs-openflowd
+NAME=ovs-openflowd
+DESC=ovs-openflowd
 
 test -x $DAEMON || exit 0
 
@@ -35,7 +35,7 @@ DODTIME=1                   # Time to wait for the server to die, in seconds
                             # let some servers to die gracefully and
                             # 'restart' will not work
 
-# Include secchan defaults if available
+# Include ovs-openflowd defaults if available
 unset NETDEVS
 unset MODE
 unset SWITCH_IP
@@ -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
@@ -319,7 +331,7 @@ case "$1" in
             check_op "Setting core limit to $CORE_LIMIT" ulimit -c "$CORE_LIMIT"
         fi
 
-        # Compose secchan options.
+        # Compose ovs-openflowd options.
         set --
         set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err
         set -- "$@" --log-file
@@ -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)