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

login
register
mail settings
Submitter Amy Fong
Date July 27, 2012, 3:06 p.m.
Message ID <20120727150655.GA3419@windriver.com>
Download mbox | patch
Permalink /patch/33229/
State New
Headers show

Comments

Amy Fong - July 27, 2012, 3:06 p.m.
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@windriver.com>
---
 init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Aug. 17, 2012, 8:52 p.m.
On 07/27/2012 08:06 AM, Amy Fong wrote:
> 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@windriver.com>
> ---
>   init |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/init b/meta/recipes-connectivity/openssh/openssh-5.9p1/init
> index 055dd22..6beec84 100644
> --- a/meta/recipes-connectivity/openssh/openssh-5.9p1/init
> +++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/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
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core
>

Patch

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