diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-13 17:34:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 17:34:00 +0000 |
| commit | 6d5fe6b8eda9dc4de1ba6cad6aa0dd9fa1538754 (patch) | |
| tree | a503023210471e9dd4db3f0a9c65dc429dba1bfc /nixos/modules/services/x11/display-managers | |
| parent | f6d7f8ae165a0427a31bb369c4a49a7c0181cb01 (diff) | |
| parent | ed20a541c59f54e12824a867e1c288ef21963ea2 (diff) | |
Merge pull request #71065 from worldofpeace/gdm-no-plymouth-conflict
nixos/gdm: don't conflict with plymouth-quit
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 597fb57a1790..e5990aec4b9c 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -170,8 +170,9 @@ in "plymouth-start.service" ]; systemd.services.display-manager.conflicts = [ - "getty@tty${gdm.initialVT}.service" - "plymouth-quit.service" + "getty@tty${gdm.initialVT}.service" + # TODO: Add "plymouth-quit.service" so GDM can control when plymouth quits. + # Currently this breaks switching configurations while using plymouth. ]; systemd.services.display-manager.onFailure = [ "plymouth-quit.service" |