[OE-core] [meta-oe][PATCH] zap_empty_root_password doesn't work with toybox, /etc/passwd isn't never edit if /etc/shadow exist.
Thomas Perrot
thomas.perrot at tupi.fr
Mon Apr 13 22:08:03 UTC 2015
From: tprrt <tprrt at tupi.fr>
Signed-off-by: tprrt <tprrt at tupi.fr>
---
meta/classes/image.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 03cbbf7..541daef 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -328,7 +328,8 @@ MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
zap_empty_root_password () {
if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow
- elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
+ fi
+ if [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd
fi
}
--
1.7.10.4
More information about the Openembedded-core
mailing list