colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #153127 from eyJhb/user-uids-fix

Browse Source 
nixos/users+nixos/lightdm: fixed users starting at 1000, and system users below 1000
This commit is contained in:
Sandro 2023-01-30 11:32:10 +01:00 committed by GitHub
commit d26c778ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/config/users-groups.nix
View File

@ -90,7 +90,7 @@ let
only has an effect if {option}`uid` is
{option}`null`, in which case it determines whether
the user's UID is allocated in the range for system users
(below 500) or in the range for normal users (starting at
(below 1000) or in the range for normal users (starting at
1000).
Exactly one of `isNormalUser` and
`isSystemUser` must be true.
@ -677,7 +677,7 @@ in {
{
assertion = let
xor = a: b: a && !b || b && !a;
isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 500);
isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 1000);
in xor isEffectivelySystemUser user.isNormalUser;
message = ''
Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set.

2
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -32,7 +32,7 @@ let
usersConf = writeText "users.conf"
''
[UserList]
minimum-uid=500
minimum-uid=1000
hidden-users=${concatStringsSep " " dmcfg.hiddenUsers}
hidden-shells=/run/current-system/sw/bin/nologin
'';