From d15e5b02fec04532bfcdcbc1c3ab13996ca04638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 13 Oct 2019 10:03:54 +0200 Subject: [PATCH] nixos/lightdm: do not conflict with plymouth (#71061) Having `display-manager` conflict with `plymouth-quit` causes this lock up: - `plymouth-quit-wait` starts up, waiting for plymouth-quit to run - `lightdm` starts up - `plymouth-quit` can't start, it conflicts with lightdm - `plymouth-quit-wait` keeps waiting on plymouth-quit to kill plymouthd The idea is having LightDM control when plymouth quits, but communication with plymouth was broken: https://github.com/NixOS/nixpkgs/pull/71064 Unfortunately having the conflict breaks switching to configurations with plymouth enabled. So we still need to remove the conflict. fixes #71034 --- nixos/modules/services/x11/display-managers/lightdm.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index aeee48de701d..cf4c05acbccd 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -220,10 +220,11 @@ in exec ${lightdm}/sbin/lightdm ''; - # Replaces getty and plymouth quit since it quits plymouth on it's own. + # Replaces getty systemd.services.display-manager.conflicts = [ "getty@tty7.service" - "plymouth-quit.service" + # TODO: Add "plymouth-quit.service" so LightDM can control when plymouth + # quits. Currently this breaks switching to configurations with plymouth. ]; # Pull in dependencies of services we replace.