[oe-commits] [openembedded-core] 90/94: openssh: fix init script restart with read-only-rootfs

[git at git.openembedded.org]

rpurdie pushed a commit to branch krogoth
in repository openembedded-core.

commit ad5a14484b780ea5d48d35dac0de8062c53077de
Author: Matthew Campbell <mcampbell at izotope.com>
AuthorDate: Tue Jun 14 17:34:18 2016 -0400

    openssh: fix init script restart with read-only-rootfs
    
    restart in the init script uses the check_config() function which doesn't have
    the $SSHD_OPTS passed through. This causes it to check the wrong config (and
    fail when read-only-rootfs is enabled.
    
    (From OE-Core rev: cb6f78072deb8b8c22baf5c31c3bd19d7e0af236)
    
    Signed-off-by: Matthew Campbell <mcampbell at izotope.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit 772ba8d865c1e7b62496df6b8eac73b367a4dc20)
    Signed-off-by: Armin Kuster <akuster at mvista.com>
---
 meta/recipes-connectivity/openssh/openssh/init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh/init b/meta/recipes-connectivity/openssh/openssh/init
index 70d4a34..1f63725 100644
--- a/meta/recipes-connectivity/openssh/openssh/init
+++ b/meta/recipes-connectivity/openssh/openssh/init
@@ -41,7 +41,7 @@ check_privsep_dir() {
 }
 
 check_config() {
-	/usr/sbin/sshd -t || exit 1
+	/usr/sbin/sshd -t $SSHD_OPTS || exit 1
 }
 
 check_keys() {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.