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:45 +0100 |
commit | b5ada042b54a811d93e5c3aae48dc435e2a0f6c1 (patch) | |
tree | 77e20ecc46f695fbed7c8ed374471ecac81d8f13 /meta/classes/image.bbclass | |
parent | 9f524997ffcaee53603be785f6a9df15e2bdb377 (diff) | |
download | poky-b5ada042b54a811d93e5c3aae48dc435e2a0f6c1.tar.gz |
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)
(From OE-Core rev: ec4dba57eb95e31954dc74dd6489f70575b54d6f)
Signed-off-by: tprrt <tprrt@tupi.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-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" | |||
335 | zap_empty_root_password () { | 335 | zap_empty_root_password () { |
336 | if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then | 336 | if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then |
337 | sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow | 337 | sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow |
338 | elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then | 338 | fi |
339 | if [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then | ||
339 | sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd | 340 | sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd |
340 | fi | 341 | fi |
341 | } | 342 | } |