diff options
| author | Michael Opdenacker <michael.opdenacker@bootlin.com> | 2022-06-15 20:36:04 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-24 23:57:42 +0100 |
| commit | 460dd9529dbc44646e62285e4f3f84f3719204aa (patch) | |
| tree | 9821f9fe0ee64d2e7f8fac6691033c6ed92217b5 | |
| parent | 85856cea84b948d66798bf8b7563f0b43ca373b6 (diff) | |
| download | poky-460dd9529dbc44646e62285e4f3f84f3719204aa.tar.gz | |
rootfs-postcommands.bbclass: correct comments
(From OE-Core rev: f0770686b36c08d99915a8d1b4d0e4450e831be4)
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 41ade8e9a14c867e146a545be8d2d9c151b6855f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index d302c23cf4..fc179613fb 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | 1 | ||
| 2 | # Zap the root password if debug-tweaks feature is not enabled | 2 | # Zap the root password if debug-tweaks and empty-root-password features are not enabled |
| 3 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password; ",d)}' | 3 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password; ",d)}' |
| 4 | 4 | ||
| 5 | # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled | 5 | # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled |
| @@ -8,7 +8,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb | |||
| 8 | # Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled | 8 | # Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled |
| 9 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}' | 9 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}' |
| 10 | 10 | ||
| 11 | # Enable postinst logging if debug-tweaks is enabled | 11 | # Enable postinst logging if debug-tweaks or post-install-logging is enabled |
| 12 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' | 12 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' |
| 13 | 13 | ||
| 14 | # Create /etc/timestamp during image construction to give a reasonably sane default time setting | 14 | # Create /etc/timestamp during image construction to give a reasonably sane default time setting |
| @@ -140,7 +140,7 @@ read_only_rootfs_hook () { | |||
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | # | 142 | # |
| 143 | # This function is intended to disallow empty root password if 'debug-tweaks' is not in IMAGE_FEATURES. | 143 | # This function disallows empty root passwords |
| 144 | # | 144 | # |
| 145 | zap_empty_root_password () { | 145 | zap_empty_root_password () { |
| 146 | if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then | 146 | if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then |
| @@ -202,7 +202,7 @@ python sort_passwd () { | |||
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | # | 204 | # |
| 205 | # Enable postinst logging if debug-tweaks is enabled | 205 | # Enable postinst logging |
| 206 | # | 206 | # |
| 207 | postinst_enable_logging () { | 207 | postinst_enable_logging () { |
| 208 | mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/default | 208 | mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/default |
