openssh: openssh's init fails to restart if sshd is not running

openssh: openssh's init fails to restart if sshd is not running

Because of "set -e", it's necessary to specify the -o (or --oknodo)
so that start-stop-daemon returns an exit status of 0 if no actions
are taken.

(From OE-Core rev: 7e44d2e8457c9c90932ce4f0fd95c67b74efb2e0)

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/init b/meta/recipes-connectivity/openssh/openssh-6.0p1/init
index 055dd22..cde52ef 100644 (file)
--- a/meta/recipes-connectivity/openssh/openssh-6.0p1/init
+++ b/meta/recipes-connectivity/openssh/openssh-6.0p1/init
@@ -76,7 +76,7 @@ case "$1" in
        check_keys
        check_config
         echo -n "Restarting OpenBSD Secure Shell server: sshd"
-       start-stop-daemon -K -x /usr/sbin/sshd
+       start-stop-daemon -K -oknodo -x /usr/sbin/sshd
        check_for_no_start
        check_privsep_dir
        sleep 2