1 files changed, 12 insertions, 0 deletions

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 494664627d..116bd226ea 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -262,6 +262,18 @@ read_only_rootfs_hook () {
                 if [ -x ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh ]; then
                         ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh
                 fi
+                # If we're using openssh and the /etc/ssh directory has no pre-generated keys,
+                # we should configure openssh to use the configuration file /etc/ssh/sshd_config_readonly
+                # and the keys under /var/run/ssh.
+                if [ -d ${IMAGE_ROOTFS}/etc/ssh ]; then
+                        if [ -e ${IMAGE_ROOTFS}/etc/ssh/ssh_host_rsa_key ]; then
+                                echo "SYSCONFDIR=/etc/ssh" >> ${IMAGE_ROOTFS}/etc/default/ssh
+                                echo "SSHD_OPTS=" >> ${IMAGE_ROOTFS}/etc/default/ssh
+                        else
+                                echo "SYSCONFDIR=/var/run/ssh" >> ${IMAGE_ROOTFS}/etc/default/ssh
+                                echo "SSHD_OPTS='-f /etc/ssh/sshd_config_readonly'" >> ${IMAGE_ROOTFS}/etc/default/ssh
+                        fi
+                fi
         fi
 }