]> code.ossystems Code Review - openembedded-core.git/commitdiff
openssh: fix init script restart with read-only-rootfs
authorMatthew Campbell <mcampbell@izotope.com>
Tue, 14 Jun 2016 21:34:18 +0000 (17:34 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Jun 2016 18:34:46 +0000 (19:34 +0100)
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@izotope.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 772ba8d865c1e7b62496df6b8eac73b367a4dc20)
Signed-off-by: Armin Kuster <akuster@mvista.com>
meta/recipes-connectivity/openssh/openssh/init

index 70d4a34659231df844447906a4ed04b03df01da9..1f63725cc0917d90773f51d77ebdaf2acb51fec4 100644 (file)
@@ -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() {