summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-01-26 16:20:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-26 18:05:13 +0000
commit88ca2276c14a625c3b4b1da407d75255f7ccae7f (patch)
tree56f5eb2494a0acbd7f4a252780f4117a293983db /meta
parentfdac3636843e00ed993dfd3a7327f71ee1e54b77 (diff)
downloadpoky-88ca2276c14a625c3b4b1da407d75255f7ccae7f.tar.gz
rootfs-postcommands: fix allow-empty-password on read-only rootfs
When a read-only rootfs is being used sshd uses a different sshd_config file, which also needs to be editted. [ YOCTO #8680 ] (From OE-Core rev: cff11495cc376f080e06028655e4eb6c7f8a8094) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/rootfs-postcommands.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index 0736d6c533..f5d6147b4d 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -113,8 +113,8 @@ zap_empty_root_password () {
113# 113#
114ssh_allow_empty_password () { 114ssh_allow_empty_password () {
115 if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then 115 if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
116 sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config 116 sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config_readonly
117 sed -i 's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config 117 sed -i 's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config_readonly
118 fi 118 fi
119 119
120 if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then 120 if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then