From: Daniel Gomez <daniel@qtec.com>
Date: Tue, 27 Sep 2022 10:30:06 +0000 (+0200)
Subject: rootfs-postcommands: Remove dropbear inconsistent comment
X-Git-Tag: yocto-4.1~22
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cb80493fa8e2f4fc0f368b0f77ffb35c58ba5b40;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

rootfs-postcommands: Remove dropbear inconsistent comment

When allow-root-login, remove default dropbear comment 'Disallow
root'.

Signed-off-by: Daniel Gomez <daniel@qtec.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass
index 74601f0829a..690fa976aae 100644
--- a/meta/classes-recipe/rootfs-postcommands.bbclass
+++ b/meta/classes-recipe/rootfs-postcommands.bbclass
@@ -204,6 +204,7 @@ ssh_allow_root_login () {
 	if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then
 		if grep -q DROPBEAR_EXTRA_ARGS ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear 2>/dev/null ; then
 			sed -i '/^DROPBEAR_EXTRA_ARGS=/ s/-w//' ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear
+			sed -i '/^# Disallow root/d' ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear
 		fi
 	fi
 }