summary refs log tree commit diff
path: root/nixos/modules/system/boot/stage-1.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-04 16:53:42 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-04 16:53:42 +0100
commit6d02d7e740396980cf4f36b3a623eea01155b6d2 (patch)
tree047e2a0e6c6e7fb64ef8404549620ea38e49208b /nixos/modules/system/boot/stage-1.nix
parent517d8c88469bc6cd72056e7cc24c42d9ee98334e (diff)
downloadnixpkgs-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar
nixpkgs-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.gz
nixpkgs-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.bz2
nixpkgs-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.lz
nixpkgs-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.xz
nixpkgs-6d02d7e740396980cf4f36b3a623eea01155b6d2.tar.zst
nixpkgs-6d02d7e740396980cf4f36b3a623eea01155b6d2.zip
NixOS tests: Increase hung_task_timeout_secs
This hopefully fixes intermittent test failures like

  http://hydra.nixos.org/build/29962437

  router# [  240.128835] INFO: task mke2fs:99 blocked for more than 120 seconds.
  router# [  240.130135]       Not tainted 3.18.25 #1-NixOS
  router# [  240.131110] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.

assuming that these are caused by high load on the host.
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
-rw-r--r--nixos/modules/system/boot/stage-1.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 58a0749c74e..694a5cfb6f8 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -203,7 +203,7 @@ let
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
-      postEarlyDeviceCommands preLVMCommands postDeviceCommands postMountCommands kernelModules;
+      preLVMCommands preDeviceCommands postEarlyDeviceCommands postDeviceCommands postMountCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
@@ -303,6 +303,15 @@ in
       '';
     };
 
+    boot.initrd.preDeviceCommands = mkOption {
+      default = "";
+      type = types.lines;
+      description = ''
+        Shell commands to be executed before udev is started to create
+        device nodes.
+      '';
+    };
+
     boot.initrd.postDeviceCommands = mkOption {
       default = "";
       type = types.lines;