diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-03-15 01:27:14 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-21 22:43:00 +0000 |
| commit | 8e4b4e28a7c3a9dbd6b9298bea5d2c1328b3f24a (patch) | |
| tree | ef6e59bc1314df3eebcee473acbad8840a16fbec /meta/classes | |
| parent | e744fac05fc5cc19cabc59c1e79ff4c1b3ee396d (diff) | |
| download | openembedded-core-contrib-8e4b4e28a7c3a9dbd6b9298bea5d2c1328b3f24a.tar.gz | |
useradd-staticids.bbclass: Always fail/warn for missing IDs
Previously, with USERADD_ERROR_DYNAMIC set to error/warn, if a static
UID/GID was specified in the recipe, then no error/warning would be
issued even if no ID was specified in the passwd/groups files.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/useradd-staticids.bbclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 9b194df490..c156a12ee5 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -123,8 +123,7 @@ def update_useradd_static_config(d): users = merge_files(get_passwd_list(d), 7) if uaargs.LOGIN not in users: - if not uaargs.uid or not uaargs.uid.isdigit() or not uaargs.gid: - handle_missing_id(uaargs.LOGIN, 'user', pkg) + handle_missing_id(uaargs.LOGIN, 'user', pkg) newparams.append(param) continue @@ -259,8 +258,7 @@ def update_useradd_static_config(d): groups = merge_files(get_group_list(d), 4) if gaargs.GROUP not in groups: - if not gaargs.gid or not gaargs.gid.isdigit(): - handle_missing_id(gaargs.GROUP, 'group', pkg) + handle_missing_id(gaargs.GROUP, 'group', pkg) newparams.append(param) continue |