From f02c843d8138a92d397ae5aff9027b9863fdd09d Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Tue, 28 May 2013 17:18:12 -0700 Subject: [PATCH] debian: Don't fail ovs-controller restart if daemon not running. Reported-by: Maxime Brun Signed-off-by: Gurucharan Shetty --- AUTHORS | 1 + debian/openvswitch-controller.init | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 93f9b1aab..dd021687c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -140,6 +140,7 @@ Kris zhang zhang.kris@gmail.com Krishna Miriyala krishna@nicira.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 $? -- 2.20.1