summary refs log tree commit diff
path: root/nixos/modules/services/x11/xserver.nix
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-01-13 17:16:51 +0300
committerNikolay Amiantov <ab@fmap.me>2016-01-13 17:31:23 +0300
commitb292e19fbddaddd4ada813965e3be3880f15fa7e (patch)
treece6b638b02eb77cf3845f6ca3508a31f4a732c7b /nixos/modules/services/x11/xserver.nix
parent4be51c84d53338e77dccc6dd083ef4d8f368c24e (diff)
downloadnixlib-b292e19fbddaddd4ada813965e3be3880f15fa7e.tar
nixlib-b292e19fbddaddd4ada813965e3be3880f15fa7e.tar.gz
nixlib-b292e19fbddaddd4ada813965e3be3880f15fa7e.tar.bz2
nixlib-b292e19fbddaddd4ada813965e3be3880f15fa7e.tar.lz
nixlib-b292e19fbddaddd4ada813965e3be3880f15fa7e.tar.xz
nixlib-b292e19fbddaddd4ada813965e3be3880f15fa7e.tar.zst
nixlib-b292e19fbddaddd4ada813965e3be3880f15fa7e.zip
xserver service: wait for systemd-logind
This seems the right thing to do, and most likely has fixed the race condition
described at https://github.com/NixOS/nixpkgs/issues/12132#issuecomment-171284532
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
-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 a7a9aac5c7fa..68745ba8197a 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -502,7 +502,7 @@ in
     systemd.services.display-manager =
       { description = "X11 Server";
 
-        after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" ];
+        after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
 
         restartIfChanged = false;