From: Gurucharan Shetty <gshetty@nicira.com>
Date: Wed, 29 May 2013 00:18:12 +0000 (-0700)
Subject: debian: Don't fail ovs-controller restart if daemon not running.
X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~191
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=64a1c30742a6a6645785f15ac35c83b5e6ea5ec3;p=sliver-openvswitch.git

debian: Don't fail ovs-controller restart if daemon not running.

Reported-by: Maxime Brun <m.brun@alphalink.fr>
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
---

diff --git a/AUTHORS b/AUTHORS
index 498e9f09e..d15173ea4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -166,6 +166,7 @@ Krishna Miriyala        krishna@nicira.com
 Logan Rosen             logatronico@gmail.com
 Luca Falavigna          dktrkranz@debian.org
 Luiz Henrique Ozaki     luiz.ozaki@gmail.com
+Maxime Brun             m.brun@alphalink.fr
 Michael A. Collins      mike.a.collins@ark-net.org
 Michael Hu              mhu@nicira.com
 Michael Mao             mmao@nicira.com
diff --git a/debian/openvswitch-controller.init b/debian/openvswitch-controller.init
index b073ddef0..44d2c873d 100755
--- a/debian/openvswitch-controller.init
+++ b/debian/openvswitch-controller.init
@@ -242,9 +242,11 @@ case "$1" in
         ;;
   restart|force-reload)
         log_daemon_msg "Restarting $DESC" "$NAME"
-        stop_server
-        # Wait some sensible amount, some server need this
-        [ -n "$DODTIME" ] && sleep $DODTIME
+        if running; then
+            stop_server
+            # Wait some sensible amount, some server need this.
+            [ -n "$DODTIME" ] && sleep $DODTIME
+        fi
         start_server
         running
         log_end_msg $?