summary refs log tree commit diff
path: root/nixos/modules/testing
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-27 11:08:28 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-27 11:22:27 +0200
commitb786b00023fa2166c3acaad002cbeb087e5395f7 (patch)
tree535bb91b7bb67bf2a5bd81b6ed56c4f600878e90 /nixos/modules/testing
parentef8ea38fe828728757d6183136d227f02d2a1bd5 (diff)
downloadnixpkgs-b786b00023fa2166c3acaad002cbeb087e5395f7.tar
nixpkgs-b786b00023fa2166c3acaad002cbeb087e5395f7.tar.gz
nixpkgs-b786b00023fa2166c3acaad002cbeb087e5395f7.tar.bz2
nixpkgs-b786b00023fa2166c3acaad002cbeb087e5395f7.tar.lz
nixpkgs-b786b00023fa2166c3acaad002cbeb087e5395f7.tar.xz
nixpkgs-b786b00023fa2166c3acaad002cbeb087e5395f7.tar.zst
nixpkgs-b786b00023fa2166c3acaad002cbeb087e5395f7.zip
KDE test: Bump kdm start timeout
Hopefully this will fix random failures like
http://hydra.nixos.org/build/36249079.
Diffstat (limited to 'nixos/modules/testing')
-rw-r--r--nixos/modules/testing/test-instrumentation.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 40a40c8a570..e216351b434 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -115,6 +115,14 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     services.xserver.displayManager.logToJournal = true;
 
+    # Bump kdm's X server start timeout to account for heavily loaded
+    # VM host systems.
+    services.xserver.displayManager.kdm.extraConfig =
+      ''
+        [X-:*-Core]
+        ServerTimeout=240
+      '';
+
   };
 
 }