summaryrefslogtreecommitdiffstats
path: root/meta/classes/core-image.bbclass
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-12-11 13:41:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-14 09:16:37 +0000
commitc38fee231b42b9123dd1fd102235eac6240ba4c8 (patch)
treec221fcba9bde5019a0e009b7a47d7be5fe12c6ca /meta/classes/core-image.bbclass
parent7b58b5feaa22c82e997165fc130c8545f5b1a129 (diff)
downloadpoky-c38fee231b42b9123dd1fd102235eac6240ba4c8.tar.gz
image.bbclass: fix for zap_root_password
Previously, this function replaces the root password with '*' if 'debug-tweaks' is not in IMAGE_FEATURES. It not only zaps empty root password, but also zaps non-empty root password. That means, if the user uses a bbappend file for base-passwd to set the root password, he would not be able to login as root; if the user uses 'EXTRA_USERS_PARAMS' to set the root password, he would still not be able to login as root. What we really want from this function is to disallow empty root password if 'debug-tweaks' is not in IMAGE_FEATURES. This function should not remove non-empty root password because that password is usually deliberately set by the user. This patch renames zap_root_password to zap_empty_root_password to better reflect the intent of this function. It also modifies the code to make this function work correctly. (From OE-Core rev: c1037a74f934966a0df8c85138b09d672b9f8b36) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/core-image.bbclass')
-rw-r--r--meta/classes/core-image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index e7c34e2791..fc4bd2f6f1 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -74,7 +74,7 @@ inherit image
74ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " 74ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
75 75
76# Zap the root password if debug-tweaks feature is not enabled 76# Zap the root password if debug-tweaks feature is not enabled
77ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "", "zap_root_password ; ",d)}' 77ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "", "zap_empty_root_password ; ",d)}'
78 78
79# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled 79# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled
80ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' 80ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}'