diff options
| author | tprrt <tprrt@tupi.fr> | 2015-04-14 00:08:03 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 18:12:08 +0100 |
| commit | ec4dba57eb95e31954dc74dd6489f70575b54d6f (patch) | |
| tree | 7e20279de129c5913ba0d9eaffe63c47107bdc0b /meta/classes | |
| parent | e56dea7dd588da62d33d33b21f857020d612e9f0 (diff) | |
| download | openembedded-core-ec4dba57eb95e31954dc74dd6489f70575b54d6f.tar.gz openembedded-core-ec4dba57eb95e31954dc74dd6489f70575b54d6f.tar.bz2 openembedded-core-ec4dba57eb95e31954dc74dd6489f70575b54d6f.zip | |
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>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
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 } |