From: Enrico Scholz <enrico.sch...@sigma-chemnitz.de>
Install 'openssh-config-allow-root-login' when corresponding
IMAGE_FEATURES are active.
Signed-off-by: Enrico Scholz <enrico.sch...@sigma-chemnitz.de>
---
meta/classes-recipe/core-image.bbclass | 1 +
meta/classes-recipe/rootfs-postcommands.bbclass | 6 ------
meta/recipes-connectivity/openssh/openssh-config.bb | 2 ++
.../openssh/openssh-config/60-allow-root-login.conf | 1 +
4 files changed, 4 insertions(+), 6 deletions(-)
create mode 100644
meta/recipes-connectivity/openssh/openssh-config/60-allow-root-login.conf
diff --git a/meta/classes-recipe/core-image.bbclass
b/meta/classes-recipe/core-image.bbclass
index 63e0e99b2a56..10a2905d9a27 100644
--- a/meta/classes-recipe/core-image.bbclass
+++ b/meta/classes-recipe/core-image.bbclass
@@ -85,6 +85,7 @@ IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
OPENSSH_FEATURE_CONFIGURATION = "\
${@bb.utils.contains_any('IMAGE_FEATURES', [ 'debug-tweaks',
'allow-empty-password' ], 'openssh-config-allow-empty-password', '',d)} \
+ ${@bb.utils.contains_any('IMAGE_FEATURES', [ 'debug-tweaks',
'allow-root-login' ], 'openssh-config-allow-root-login', '',d)} \
"
inherit image
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass
b/meta/classes-recipe/rootfs-postcommands.bbclass
index 88f88505b5ed..633f88de6ec8 100644
--- a/meta/classes-recipe/rootfs-postcommands.bbclass
+++ b/meta/classes-recipe/rootfs-postcommands.bbclass
@@ -268,12 +268,6 @@ ssh_allow_empty_password () {
# allow dropbear/openssh to accept root logins
#
ssh_allow_root_login () {
- 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
- fi
- done
-
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
diff --git a/meta/recipes-connectivity/openssh/openssh-config.bb
b/meta/recipes-connectivity/openssh/openssh-config.bb
index 20dfe086f8ab..d4ed661d8299 100644
--- a/meta/recipes-connectivity/openssh/openssh-config.bb
+++ b/meta/recipes-connectivity/openssh/openssh-config.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
SRC_URI = "\
file://60-allow-empty-password.conf \
+ file://60-allow-root-login.conf \
file://80-oe.conf \
"
@@ -13,6 +14,7 @@ do_install() {
install -d "$d"
install -p -m 0644 \
${WORKDIR}/60-allow-empty-password.conf \
+ ${WORKDIR}/60-allow-root-login.conf \
${WORKDIR}/80-oe.conf \
"$d"/
diff --git
a/meta/recipes-connectivity/openssh/openssh-config/60-allow-root-login.conf
b/meta/recipes-connectivity/openssh/openssh-config/60-allow-root-login.conf
new file mode 100644
index 000000000000..1073982f77c1
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-config/60-allow-root-login.conf
@@ -0,0 +1 @@
+PermitRootLogin yes
--
2.44.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196958):
https://lists.openembedded.org/g/openembedded-core/message/196958
Mute This Topic: https://lists.openembedded.org/mt/104868007/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
