@@ -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
@@ -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
@@ -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"/
new file mode 100644
@@ -0,0 +1 @@
+PermitRootLogin yes