From 09ac2664fba223111c20c3000af6b8d5cdaabeb1 Mon Sep 17 00:00:00 2001 From: tprrt Date: Tue, 14 Apr 2015 00:08:03 +0200 Subject: image: zap_empty_root_password doesn't handle passwd file in shadow case /etc/passwd isn't editted if /etc/shadow exists and should be else it can cause problems with some login providers such as toybox. Signed-off-by: tprrt Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index dc9bd80165..01f8b3fc19 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -335,7 +335,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 } -- cgit 1.2.3-korg