diff options
Diffstat (limited to 'meta/classes/useradd-staticids.bbclass')
| -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 2d282c0d71..6ebf7600f6 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass | |||
| @@ -141,9 +141,13 @@ def update_useradd_static_config(d): | |||
| 141 | # So if the implicit username-group creation is on, then the implicit groupname (LOGIN) | 141 | # So if the implicit username-group creation is on, then the implicit groupname (LOGIN) |
| 142 | # is used, and we disable the user_group option. | 142 | # is used, and we disable the user_group option. |
| 143 | # | 143 | # |
| 144 | user_group = uaargs.user_group is None or uaargs.user_group is True | 144 | if uaargs.gid: |
| 145 | uaargs.groupname = uaargs.LOGIN if user_group else uaargs.gid | 145 | uaargs.groupname = uaargs.gid |
| 146 | uaargs.groupid = field[3] or uaargs.gid or uaargs.groupname | 146 | elif uaargs.user_group is not False: |
| 147 | uaargs.groupname = uaargs.LOGIN | ||
| 148 | else: | ||
| 149 | uaargs.groupname = 'users' | ||
| 150 | uaargs.groupid = field[3] or uaargs.groupname | ||
| 147 | 151 | ||
| 148 | if uaargs.groupid and uaargs.gid != uaargs.groupid: | 152 | if uaargs.groupid and uaargs.gid != uaargs.groupid: |
| 149 | newgroup = None | 153 | newgroup = None |