diff options
| author | Matthew Campbell <mcampbell@izotope.com> | 2016-06-14 17:34:18 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:36:02 +0100 |
| commit | b2a6a89a297058c1f98815d3b023cca5af93d120 (patch) | |
| tree | 2ea0ec351c32ac44ef0f5a146c861c7674e88ede /meta/recipes-connectivity | |
| parent | 39d2072ae9c57efef49d016e8af18899b5e5f98c (diff) | |
| download | poky-b2a6a89a297058c1f98815d3b023cca5af93d120.tar.gz | |
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)
(From OE-Core rev: ad5a14484b780ea5d48d35dac0de8062c53077de)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh/init | 2 |
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() { | |||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | check_config() { | 43 | check_config() { |
| 44 | /usr/sbin/sshd -t || exit 1 | 44 | /usr/sbin/sshd -t $SSHD_OPTS || exit 1 |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | check_keys() { | 47 | check_keys() { |