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

Reported-by: Maxime Brun <[email protected]> Signed-off-by: Gurucharan Shetty <[email protected]>
smehner1 · May 29, 2013 · 64a1c30 · 64a1c30
1 parent bbafd73
commit 64a1c30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -166,6 +166,7 @@ Krishna Miriyala        [email protected]
 Logan Rosen             [email protected]
 Luca Falavigna          [email protected]
 Luiz Henrique Ozaki     [email protected]
+Maxime Brun             [email protected]
 Michael A. Collins      [email protected]
 Michael Hu              [email protected]
 Michael Mao             [email protected]

diff --git 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 $?