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

nixos/gdm: Conflict plymouth-quit, but more carefully 

To avoid extra flickering on boot, we want GDM to tell Plymouth to
quit after GDM takes control of the display.  That configuration was
reverted in #71065 because it caused ‘nixos-rebuild switch’ to bring
down the graphical session.  The reason was that if multi-user.target
wants plymouth-quit.service which conflicts display-manager.service,
then when ‘nixos-rebuild switch’ starts multi-user.target,
display-manager.service is stopped so plymouth-quit.service can be
started.  We avoid this problem by removing WantedBy:
multi-user.target from plymouth-quit.service.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2020-10-15 01:56:59 -07:00
parent 24c9b05ac5
commit da5401e022
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,14 +183,20 @@ in
"systemd-udev-settle.service" "systemd-udev-settle.service"
]; ];
systemd.services.display-manager.conflicts = [ systemd.services.display-manager.conflicts = [
"getty@tty${gdm.initialVT}.service" "getty@tty${gdm.initialVT}.service"
# TODO: Add "plymouth-quit.service" so GDM can control when plymouth quits. "plymouth-quit.service"
# Currently this breaks switching configurations while using plymouth.
]; ];
systemd.services.display-manager.onFailure = [ systemd.services.display-manager.onFailure = [
"plymouth-quit.service" "plymouth-quit.service"
]; ];
# Prevent nixos-rebuild switch from bringing down the graphical
# session. (If multi-user.target wants plymouth-quit.service which
# conflicts display-manager.service, then when nixos-rebuild
# switch starts multi-user.target, display-manager.service is
# stopped so plymouth-quit.service can be started.)
systemd.services.plymouth-quit.wantedBy = lib.mkForce [];
systemd.services.display-manager.serviceConfig = { systemd.services.display-manager.serviceConfig = {
# Restart = "always"; - already defined in xserver.nix # Restart = "always"; - already defined in xserver.nix
KillMode = "mixed"; KillMode = "mixed";