summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorMatthew Campbell <mcampbell@izotope.com>2016-06-14 17:34:18 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-29 19:34:46 +0100
commitad5a14484b780ea5d48d35dac0de8062c53077de (patch)
tree33e8eb8ee47de4353a456ae13ed7aaf206426fa5 /meta/recipes-connectivity
parent6564ab0ff6be2a2a697798ee99106e1bc3208a94 (diff)
downloadopenembedded-core-ad5a14484b780ea5d48d35dac0de8062c53077de.tar.gz
openembedded-core-ad5a14484b780ea5d48d35dac0de8062c53077de.tar.bz2
openembedded-core-ad5a14484b780ea5d48d35dac0de8062c53077de.zip
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@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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/init2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/init b/meta/recipes-connectivity/openssh/openssh/init
index 70d4a34659..1f63725cc0 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() {