[PATCHv2 2/6] useradd-staticids.bbclass: Make --no-user-group have effect

Peter Kjellerstedt
2015-12-18T23:54:04Z

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>
---
meta/classes/useradd-staticids.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 9d59aca..c2e6579 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]]

--
2.1.0