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

Merge pull request #100569 from andersk/gdm-plymouth 

nixos/gdm: Conflict plymouth-quit, but more carefully
This commit is contained in:
WORLDofPEACE 2021-02-21 11:03:18 -05:00 committed by GitHub
parent aed173ff97 da5401e022
commit 4287f5adfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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";