diff options
| author | Matthew Campbell <mcampbell@izotope.com> | 2016-06-14 17:34:18 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-23 14:26:14 +0100 |
| commit | 772ba8d865c1e7b62496df6b8eac73b367a4dc20 (patch) | |
| tree | fa1afcaa8e3236265efd7c42e232ba1ec58b1323 | |
| parent | e6faa3d0bb6adc98dd34337a96a16bf5b7209021 (diff) | |
| download | poky-772ba8d865c1e7b62496df6b8eac73b367a4dc20.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)
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>
| -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() { |