diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2015-12-19 00:53:48 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:06 +0000 |
| commit | b689aa0df3c2cd36d3b54dd84ec3e264e8fd85ff (patch) | |
| tree | aa747b99bedbcb32280dbf5aca60182ee968c8e3 | |
| parent | c03ea8dddc491770dbbc0e32a604924dfeb950bd (diff) | |
| download | poky-b689aa0df3c2cd36d3b54dd84ec3e264e8fd85ff.tar.gz | |
useradd-staticids.bbclass: Make --no-user-group have effect
If --no-user-group is specified in USERADD_PARAM_${PN} for a user and
no --gid is specified, then we should not assume that the group name
for the user is the user name.
(From OE-Core rev: 0e5402c433739a416a76df532378533cb25365c7)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/useradd-staticids.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 9d59aca45c..c2e6579b22 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass | |||
| @@ -107,7 +107,7 @@ def update_useradd_static_config(d): | |||
| 107 | # is used, and we disable the user_group option. | 107 | # is used, and we disable the user_group option. |
| 108 | # | 108 | # |
| 109 | user_group = uaargs.user_group is None or uaargs.user_group is True | 109 | user_group = uaargs.user_group is None or uaargs.user_group is True |
| 110 | uaargs.groupname = [uaargs.gid, uaargs.LOGIN][not uaargs.gid or user_group] | 110 | uaargs.groupname = [uaargs.LOGIN, uaargs.gid][not user_group] |
| 111 | uaargs.groupid = [uaargs.gid, uaargs.groupname][not uaargs.gid] | 111 | uaargs.groupid = [uaargs.gid, uaargs.groupname][not uaargs.gid] |
| 112 | uaargs.groupid = [field[3], uaargs.groupid][not field[3]] | 112 | uaargs.groupid = [field[3], uaargs.groupid][not field[3]] |
| 113 | 113 | ||