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

nixos gdm: use AutomaticLogin if delay is zero. Closes #9843

Browse Source
This commit is contained in:
Luca Bruno 2015-09-14 08:48:00 +00:00
parent 6644af5910
commit c94a625585
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -112,13 +112,21 @@ in
programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm"; programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
# Use AutomaticLogin if delay is zero, because it's immediate.
# Otherwise with TimedLogin with zero seconds the prompt is still
# presented and there's a little delay.
environment.etc."gdm/custom.conf".text = '' environment.etc."gdm/custom.conf".text = ''
[daemon] [daemon]
${optionalString cfg.gdm.autoLogin.enable '' ${optionalString cfg.gdm.autoLogin.enable (
TimedLoginEnable=true if cfg.gdm.autoLogin.delay > 0 then ''
TimedLogin=${cfg.gdm.autoLogin.user} TimedLoginEnable=true
TimedLoginDelay=${toString cfg.gdm.autoLogin.delay} TimedLogin=${cfg.gdm.autoLogin.user}
''} TimedLoginDelay=${toString cfg.gdm.autoLogin.delay}
'' else ''
AutomaticLoginEnable=true
AutomaticLogin=${cfg.gdm.autoLogin.user}
'')
}
[security] [security]