From ecde113c525d31bf7b943fff9ae3d88c71b6c00f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2009 15:58:39 +0000
Subject: [PATCH] * Fix logging out in X.  Without this option, the X server
 dies for   some reason:

  Sep 10 17:52:49 dutibo kernel: mtrr: no MTRR for f0000000,400000 found
  Sep 10 17:52:50 dutibo kdm[2960]: X server for display :0 terminated unexpectedly
  Sep 10 17:52:50 dutibo kdm[2960]: Unable to fire up local display :0; disabling.

svn path=/nixos/trunk/; revision=17013
---
 modules/services/x11/display-managers/kdm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index d0d30effbf0..55ab406b9e9 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -22,6 +22,8 @@ let
 
       [X-:*-Core]
       ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+      # Needed to prevent the X server from dying on logout and not coming back:
+      TerminateServer=true
 
       [X-*-Greeter]
       HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10