From: Jonathan Liu Date: Thu, 10 Apr 2014 08:24:19 +0000 (+1000) Subject: image.bbclass: improve sed expressions for ssh_allow_empty_password() X-Git-Tag: 2015-4~3090 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0572196158d9505a624bdee71760978f284728b0;p=openembedded-core.git image.bbclass: improve sed expressions for ssh_allow_empty_password() The sed expression was also replacing documentation text containing PermitRootLogin in the line so "PermitRootLogin yes" was specified twice. Signed-off-by: Jonathan Liu Signed-off-by: Richard Purdie --- diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 32df01d2b3..79de5a2cae 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -285,8 +285,8 @@ zap_empty_root_password () { # allow dropbear/openssh to accept root logins and logins from accounts with an empty password string ssh_allow_empty_password () { if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then - sed -i 's#.*PermitRootLogin.*#PermitRootLogin yes#' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config - sed -i 's#.*PermitEmptyPasswords.*#PermitEmptyPasswords yes#' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config + sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config + sed -i 's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config fi if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then