diff options
author | André Draszik <adraszik@tycoint.com> | 2017-10-06 13:12:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:39:47 +0000 |
commit | 28b8850356cb6325e0ef8cf5ed83e20a22044a9e (patch) | |
tree | 3a396d1714b35a791d743f1b91475bcf711a64d2 /meta/classes/rootfs-postcommands.bbclass | |
parent | cd28daadfd92e390b85546a847c23e11d994dc46 (diff) | |
download | poky-28b8850356cb6325e0ef8cf5ed83e20a22044a9e.tar.gz |
openssh: allow to override OpenSSL HostKeys when read-only-rootfs
With these changes it is possible to have a .bbappend that
- sets SYSCONFDIR to some persistent storage
- modifies SYSCONFDIR/sshd_config to use ssh host keys from
the (writable) sysconfdir
(From OE-Core rev: 79c7c8342859306750f0af17210a183fdc543caf)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Reviewed-by: Stephane Ayotte <sayotte@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 106b59d9f96f70d133fa1421091ad280d27a5b6a)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs-postcommands.bbclass')
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 2503d89e28..4b91972ce7 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
@@ -91,10 +91,10 @@ read_only_rootfs_hook () { | |||
91 | # and the keys under /var/run/ssh. | 91 | # and the keys under /var/run/ssh. |
92 | if [ -d ${IMAGE_ROOTFS}/etc/ssh ]; then | 92 | if [ -d ${IMAGE_ROOTFS}/etc/ssh ]; then |
93 | if [ -e ${IMAGE_ROOTFS}/etc/ssh/ssh_host_rsa_key ]; then | 93 | if [ -e ${IMAGE_ROOTFS}/etc/ssh/ssh_host_rsa_key ]; then |
94 | echo "SYSCONFDIR=/etc/ssh" >> ${IMAGE_ROOTFS}/etc/default/ssh | 94 | echo "SYSCONFDIR=\${SYSCONFDIR:-/etc/ssh}" >> ${IMAGE_ROOTFS}/etc/default/ssh |
95 | echo "SSHD_OPTS=" >> ${IMAGE_ROOTFS}/etc/default/ssh | 95 | echo "SSHD_OPTS=" >> ${IMAGE_ROOTFS}/etc/default/ssh |
96 | else | 96 | else |
97 | echo "SYSCONFDIR=/var/run/ssh" >> ${IMAGE_ROOTFS}/etc/default/ssh | 97 | echo "SYSCONFDIR=\${SYSCONFDIR:-/var/run/ssh}" >> ${IMAGE_ROOTFS}/etc/default/ssh |
98 | echo "SSHD_OPTS='-f /etc/ssh/sshd_config_readonly'" >> ${IMAGE_ROOTFS}/etc/default/ssh | 98 | echo "SSHD_OPTS='-f /etc/ssh/sshd_config_readonly'" >> ${IMAGE_ROOTFS}/etc/default/ssh |
99 | fi | 99 | fi |
100 | fi | 100 | fi |