[oe-commits] Amy Fong : openssh: openssh's init fails to restart if sshd is not running

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 7e44d2e8457c9c90932ce4f0fd95c67b74efb2e0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7e44d2e8457c9c90932ce4f0fd95c67b74efb2e0

Author: Amy Fong <amy.fong at windriver.com>
Date:   Fri Jul 27 11:06:55 2012 -0400

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.

Signed-off-by: Amy Fong <amy.fong at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../openssh/openssh-6.0p1/init                     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.0p1/init b/meta/recipes-connectivity/openssh/openssh-6.0p1/init
index 055dd22..cde52ef 100644
--- 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