OpenSSH configuration is now a symlink which points to the desired
configuration, so the functions that modified it must be updated to
modify the target and not override it.
Signed-off-by: David Vincent <freesili...@gmail.com>
---
meta/classes/rootfs-postcommands.bbclass | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/meta/classes/rootfs-postcommands.bbclass
b/meta/classes/rootfs-postcommands.bbclass
index c8f18c6702..2d862b0b2e 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -86,20 +86,8 @@ read_only_rootfs_hook () {
# Tweak the mount option and fs_passno for rootfs in fstab
sed -i -e
'/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}'
${IMAGE_ROOTFS}/etc/fstab
- # 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
-
- # Also tweak the key location for dropbear in the same way.
+ # If we're using dropbear and the /etc/dropbear directory has no
pre-generated keys,
+ # we should configure dropbear to use the keys under /var/lib/dropbear.
if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then
if [ -e ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key ];
then
echo "DROPBEAR_RSAKEY_DIR=/etc/dropbear" >>
${IMAGE_ROOTFS}/etc/default/dropbear
@@ -138,12 +126,10 @@ zap_empty_root_password () {
# allow dropbear/openssh to accept root logins and logins from accounts with
an empty password string
#
ssh_allow_empty_password () {
- for config in sshd_config sshd_config_readonly; do
- if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then
- sed -i
's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/'
${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
- sed -i
's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/'
${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
- fi
- done
+ if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
+ sed -i --follow-symlinks
's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/'
${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
+ sed -i --follow-symlinks
's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/'
${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
+ fi
if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then
if grep -q DROPBEAR_EXTRA_ARGS
${IMAGE_ROOTFS}${sysconfdir}/default/dropbear 2>/dev/null ; then
@@ -162,7 +148,7 @@ ssh_allow_empty_password () {
ssh_disable_dns_lookup () {
if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
- sed -i -e 's:#UseDNS yes:UseDNS no:'
${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
+ sed -i --follow-symlinks -e 's:#UseDNS yes:UseDNS no:'
${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
fi
}
--
2.11.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
