diff options
| author | Armin Kuster <akuster808@gmail.com> | 2021-08-20 21:50:10 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-08-26 21:46:00 -0700 |
| commit | 867524aa50f1448abf5052439dfc1d4fe880838f (patch) | |
| tree | 0f7da7367b7bf24e70cae36990aa8cfb2a5752f2 | |
| parent | 5b49cc551dffbac6816f19d6a06da40e93b27aed (diff) | |
| download | meta-security-867524aa50f1448abf5052439dfc1d4fe880838f.tar.gz | |
harden-image-minimal: fix useradd inherit
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-hardening/recipes-core/images/harden-image-minimal.bb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-hardening/recipes-core/images/harden-image-minimal.bb b/meta-hardening/recipes-core/images/harden-image-minimal.bb index c35c257..38771cd 100644 --- a/meta-hardening/recipes-core/images/harden-image-minimal.bb +++ b/meta-hardening/recipes-core/images/harden-image-minimal.bb | |||
| @@ -10,7 +10,8 @@ LICENSE = "MIT" | |||
| 10 | 10 | ||
| 11 | IMAGE_ROOTFS_SIZE ?= "8192" | 11 | IMAGE_ROOTFS_SIZE ?= "8192" |
| 12 | 12 | ||
| 13 | inherit core-image extrausers | 13 | inherit core-image |
| 14 | IMAGE_CLASSES:append = " extrausers" | ||
| 14 | 15 | ||
| 15 | ROOT_DEFAULT_PASSWORD ?= "1SimplePw!" | 16 | ROOT_DEFAULT_PASSWORD ?= "1SimplePw!" |
| 16 | DEFAULT_ADMIN_ACCOUNT ?= "myadmin" | 17 | DEFAULT_ADMIN_ACCOUNT ?= "myadmin" |
| @@ -19,7 +20,7 @@ DEFAULT_ADMIN_ACCOUNT_PASSWORD ?= "1SimplePw!" | |||
| 19 | 20 | ||
| 20 | EXTRA_USERS_PARAMS = "${@bb.utils.contains('DISABLE_ROOT', 'True', "usermod -L root;", "usermod -P '${ROOT_DEFAULT_PASSWORD}' root;", d)}" | 21 | EXTRA_USERS_PARAMS = "${@bb.utils.contains('DISABLE_ROOT', 'True', "usermod -L root;", "usermod -P '${ROOT_DEFAULT_PASSWORD}' root;", d)}" |
| 21 | 22 | ||
| 22 | EXTRA_USERS_PARAMS += "useradd ${DEFAULT_ADMIN_ACCOUNT};" | 23 | EXTRA_USERS_PARAMS:append = " useradd ${DEFAULT_ADMIN_ACCOUNT};" |
| 23 | EXTRA_USERS_PARAMS += "groupadd ${DEFAULT_ADMIN_GROUP};" | 24 | EXTRA_USERS_PARAMS:append = " groupadd ${DEFAULT_ADMIN_GROUP};" |
| 24 | EXTRA_USERS_PARAMS += "usermod -P '${DEFAULT_ADMIN_ACCOUNT_PASSWORD}' ${DEFAULT_ADMIN_ACCOUNT};" | 25 | EXTRA_USERS_PARAMS:append = " usermod -P '${DEFAULT_ADMIN_ACCOUNT_PASSWORD}' ${DEFAULT_ADMIN_ACCOUNT};" |
| 25 | EXTRA_USERS_PARAMS += "usermod -aG ${DEFAULT_ADMIN_GROUP} ${DEFAULT_ADMIN_ACCOUNT};" | 26 | EXTRA_USERS_PARAMS:append = " usermod -aG ${DEFAULT_ADMIN_GROUP} ${DEFAULT_ADMIN_ACCOUNT};" |