[oe-commits] Jonathan Liu : openssh: fix sshd_config_readonly creation
git at git.openembedded.org
git at git.openembedded.org
Thu Apr 10 16:26:26 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 400b4bce34ffb76e500e2195104cc200218aa4c3
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=400b4bce34ffb76e500e2195104cc200218aa4c3
Author: Jonathan Liu <net147 at gmail.com>
Date: Thu Apr 10 18:24:48 2014 +1000
openssh: fix sshd_config_readonly creation
The readonly sshd config sshd_config_readonly needs to be created from
the installed sshd_config as make install will adjust the paths in
the config file. This fixes the path for sftp-server being correct
in sshd_config but incorrect in sshd_config_readonly.
Signed-off-by: Jonathan Liu <net147 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-connectivity/openssh/openssh_6.5p1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index 3496b4d..2c4da70 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -99,7 +99,7 @@ do_install_append () {
# Create config files for read-only rootfs
install -d ${D}${sysconfdir}/ssh
- install -m 644 ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly
+ install -m 644 ${D}${sysconfdir}/ssh/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly
sed -i '/HostKey/d' ${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
More information about the Openembedded-commits
mailing list