[ovs-dev] [PATCH] debian: Don't fail ovs-controller restart if daemon not running.

Gurucharan Shetty shettyg at nicira.com
Wed May 29 00:24:16 UTC 2013


Reported-by: Maxime Brun <m.brun at alphalink.fr>
Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
---
 AUTHORS                            |    1 +
 debian/openvswitch-controller.init |    8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 498e9f0..d15173e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -166,6 +166,7 @@ Krishna Miriyala        krishna at nicira.com
 Logan Rosen             logatronico at gmail.com
 Luca Falavigna          dktrkranz at debian.org
 Luiz Henrique Ozaki     luiz.ozaki at gmail.com
+Maxime Brun             m.brun at alphalink.fr
 Michael A. Collins      mike.a.collins at ark-net.org
 Michael Hu              mhu at nicira.com
 Michael Mao             mmao at nicira.com
diff --git a/debian/openvswitch-controller.init b/debian/openvswitch-controller.init
index b073dde..44d2c87 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 $?
-- 
1.7.9.5




More information about the dev mailing list