diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-10-14 11:36:35 +0200 |
---|---|---|
committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-10-14 13:08:51 +0200 |
commit | 5924bab20b8bc5470b8e22b02c6655183150f86b (patch) | |
tree | 52e3918c67ef1cb9b9f38f9d8a60230c0d1ce42f /nixos | |
parent | 1f7b1cf5813fc7cb75dbe438b9aa35a3000bfca9 (diff) | |
download | nixlib-5924bab20b8bc5470b8e22b02c6655183150f86b.tar nixlib-5924bab20b8bc5470b8e22b02c6655183150f86b.tar.gz nixlib-5924bab20b8bc5470b8e22b02c6655183150f86b.tar.bz2 nixlib-5924bab20b8bc5470b8e22b02c6655183150f86b.tar.lz nixlib-5924bab20b8bc5470b8e22b02c6655183150f86b.tar.xz nixlib-5924bab20b8bc5470b8e22b02c6655183150f86b.tar.zst nixlib-5924bab20b8bc5470b8e22b02c6655183150f86b.zip |
nixos/plymouth: do not order `plymouth-quit` after `display-manager`
GDM now specifies ordering between `plymouth-quit` and `display-manager`: 9be5321097c16 This causes an ordering cycle between GDM and plymouth-quit which can result in systemd breaking GDM: ``` plymouth-quit.service: Job display-manager.service/start deleted to break ordering cycle starting with plymouth-quit.service/start ``` Not sure how often this triggers, as I've run my system with plymouth and 9be5321097c16 without any issues. But I did catch a VM doing this. NOTE: I also tried to remove the ordering in GDM to see if plymouth managed to live longer, but it didn't seem to help. So I opted to stick as close to upstream (upstream GDM specifies ordering, but plymouth does not).
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/system/boot/plymouth.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index fd43ea1620c4..adca3c3f66e7 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -88,10 +88,7 @@ in systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ]; systemd.services.plymouth-halt.wantedBy = [ "halt.target" ]; systemd.services.plymouth-quit-wait.wantedBy = [ "multi-user.target" ]; - systemd.services.plymouth-quit = { - wantedBy = [ "multi-user.target" ]; - after = [ "display-manager.service" ]; - }; + systemd.services.plymouth-quit.wantedBy = [ "multi-user.target" ]; systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ]; systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ]; systemd.services.plymouth-read-write.wantedBy = [ "sysinit.target" ]; |