summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2021-08-13 00:32:27 +0300
committerGitHub <noreply@github.com>2021-08-13 00:32:27 +0300
commit7bd542a5e93f5a82a3cfcc80175182b5ff6614e6 (patch)
treebcb9a0c6dad527b54f65b14319d4e3e829422ce0
parentMerge pull request #133642 from NixOS/backport-133304-to-release-21.05 (diff)
parentnixos/xserver: fix a display-manager race condition (diff)
downloadnixpkgs-7bd542a5e93f5a82a3cfcc80175182b5ff6614e6.tar.gz
Merge pull request #133563 from NixOS/backport-133204-to-release-21.05
[Backport release-21.05] nixos/xserver: fix a display-manager race condition
-rw-r--r--nixos/modules/services/x11/xserver.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 52af552cd138..00c82bedffbd 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -675,7 +675,7 @@ in
systemd.services.display-manager =
{ description = "X11 Server";
- after = [ "acpid.service" "systemd-logind.service" ];
+ after = [ "acpid.service" "systemd-logind.service" "systemd-user-sessions.service" ];
restartIfChanged = false;