summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2012-07-27 15:06:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 17:04:22 (GMT)
commit54b4c50a60ad3a4ce05604c77d9b811e2fd0410b (patch)
tree0ca02e1769ce798bd93d1164f8481c48891f769c /meta
parent79512d5ef9e7d586ee996e965a2554813695eaa8 (diff)
downloadpoky-54b4c50a60ad3a4ce05604c77d9b811e2fd0410b.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.0p1/init2
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
76 check_keys 76 check_keys
77 check_config 77 check_config
78 echo -n "Restarting OpenBSD Secure Shell server: sshd" 78 echo -n "Restarting OpenBSD Secure Shell server: sshd"
79 start-stop-daemon -K -x /usr/sbin/sshd 79 start-stop-daemon -K -oknodo -x /usr/sbin/sshd
80 check_for_no_start 80 check_for_no_start
81 check_privsep_dir 81 check_privsep_dir
82 sleep 2 82 sleep 2