From 7d47575a58827ac61bf8c1068f3c81e7324233be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 11:32:28 +0000
Subject: [PATCH] * A 15-second timeout to start the X server is too low if
 there are a   billion other daemons starting at the same time during the
 boot.

svn path=/nixos/branches/upstart-0.6/; revision=18250
---
 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 551710354429..18a6623eb851 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -26,6 +26,8 @@ let
 
       [X-:*-Core]
       ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
+      # The default timeout (15) is too short in a heavily loaded boot process.
+      ServerTimeout=60
       # Needed to prevent the X server from dying on logout and not coming back:
       TerminateServer=true