From: tprrt <tprrt@tupi.fr>
Date: Mon, 13 Apr 2015 22:08:03 +0000 (+0200)
Subject: image: zap_empty_root_password doesn't handle passwd file in shadow case
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ec4dba57eb95e31954dc74dd6489f70575b54d6f;p=openembedded-core.git

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.

(From OE-Core rev: 09ac2664fba223111c20c3000af6b8d5cdaabeb1)

Signed-off-by: tprrt <tprrt@tupi.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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
 }