summary refs log tree commit diff
path: root/nixos/modules/system/boot/systemd.nix
diff options
context:
space:
mode:
authorJoerg Thalheim <joerg@thalheim.io>2017-09-27 22:23:19 +0100
committerJoerg Thalheim <joerg@thalheim.io>2017-09-27 22:28:27 +0100
commit23f398012b420e9e5293a21d62ed838062b8235a (patch)
treed04221330f022457241d49eac0d4ab9a047266ff /nixos/modules/system/boot/systemd.nix
parent672a402122535b944cd6f2819108a8bb041de839 (diff)
downloadnixpkgs-23f398012b420e9e5293a21d62ed838062b8235a.tar
nixpkgs-23f398012b420e9e5293a21d62ed838062b8235a.tar.gz
nixpkgs-23f398012b420e9e5293a21d62ed838062b8235a.tar.bz2
nixpkgs-23f398012b420e9e5293a21d62ed838062b8235a.tar.lz
nixpkgs-23f398012b420e9e5293a21d62ed838062b8235a.tar.xz
nixpkgs-23f398012b420e9e5293a21d62ed838062b8235a.tar.zst
nixpkgs-23f398012b420e9e5293a21d62ed838062b8235a.zip
nixos: skip restarting systemd-logind to not break x11
Diffstat (limited to 'nixos/modules/system/boot/systemd.nix')
-rw-r--r--nixos/modules/system/boot/systemd.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index ed1f5d20afb..dd9ba710448 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -875,7 +875,12 @@ in
     systemd.services.systemd-remount-fs.restartIfChanged = false;
     systemd.services.systemd-update-utmp.restartIfChanged = false;
     systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
-    systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
+    # Restarting systemd-logind breaks X11
+    # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101
+    # - systemd announcement: https://github.com/systemd/systemd/blob/22043e4317ecd2bc7834b48a6d364de76bb26d91/NEWS#L103-L112
+    # - this might be addressed in the future by xorg
+    #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
+    systemd.services.systemd-logind.restartIfChanged = false;
     systemd.services.systemd-logind.stopIfChanged = false;
     systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ];
     systemd.services.systemd-journald.stopIfChanged = false;