diff options
| -rw-r--r-- | meta/classes/useradd-staticids.bbclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index ce4ac62ab5..eb8e59e67a 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass | |||
| @@ -102,9 +102,13 @@ def update_useradd_static_config(d): | |||
| 102 | # So if the implicit username-group creation is on, then the implicit groupname (LOGIN) | 102 | # So if the implicit username-group creation is on, then the implicit groupname (LOGIN) |
| 103 | # is used, and we disable the user_group option. | 103 | # is used, and we disable the user_group option. |
| 104 | # | 104 | # |
| 105 | user_group = uaargs.user_group is None or uaargs.user_group is True | 105 | if uaargs.gid: |
| 106 | uaargs.groupname = uaargs.LOGIN if user_group else uaargs.gid | 106 | uaargs.groupname = uaargs.gid |
| 107 | uaargs.groupid = field[3] or uaargs.gid or uaargs.groupname | 107 | elif uaargs.user_group is not False: |
| 108 | uaargs.groupname = uaargs.LOGIN | ||
| 109 | else: | ||
| 110 | uaargs.groupname = 'users' | ||
| 111 | uaargs.groupid = field[3] or uaargs.groupname | ||
| 108 | 112 | ||
| 109 | if uaargs.groupid and uaargs.gid != uaargs.groupid: | 113 | if uaargs.groupid and uaargs.gid != uaargs.groupid: |
| 110 | newgroup = None | 114 | newgroup = None |