summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2015-12-19 00:53:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-17 11:32:19 +0000
commit0e5402c433739a416a76df532378533cb25365c7 (patch)
treea040235d4a6118c6b25c13087ae0ca64918ed10f
parent908eca7fb4af8a60026f53e2bb2cf1d5daf089ab (diff)
downloadopenembedded-core-0e5402c433739a416a76df532378533cb25365c7.tar.gz
openembedded-core-0e5402c433739a416a76df532378533cb25365c7.tar.bz2
openembedded-core-0e5402c433739a416a76df532378533cb25365c7.zip
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. 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.bbclass2
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):
# is used, and we disable the user_group option.
#
user_group = uaargs.user_group is None or uaargs.user_group is True
- uaargs.groupname = [uaargs.gid, uaargs.LOGIN][not uaargs.gid or user_group]
+ uaargs.groupname = [uaargs.LOGIN, uaargs.gid][not user_group]
uaargs.groupid = [uaargs.gid, uaargs.groupname][not uaargs.gid]
uaargs.groupid = [field[3], uaargs.groupid][not field[3]]