summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2023-06-20 11:48:45 +0200
committerGitHub <noreply@github.com>2023-06-20 11:48:45 +0200
commit8eec7326a375ff7bcb60ce256e735e59570acd6d (patch)
treed8895e21f1f92c1be3b38a8b88dc84d1598baff6 /nixos
parentb7b4da16638ecc8c1465a45289c58bff7549faaf (diff)
parentf24f7ed242fb89cb23d4fdd832b4b24f8c12e28c (diff)
downloadnixpkgs-8eec7326a375ff7bcb60ce256e735e59570acd6d.tar
nixpkgs-8eec7326a375ff7bcb60ce256e735e59570acd6d.tar.gz
nixpkgs-8eec7326a375ff7bcb60ce256e735e59570acd6d.tar.bz2
nixpkgs-8eec7326a375ff7bcb60ce256e735e59570acd6d.tar.lz
nixpkgs-8eec7326a375ff7bcb60ce256e735e59570acd6d.tar.xz
nixpkgs-8eec7326a375ff7bcb60ce256e735e59570acd6d.tar.zst
nixpkgs-8eec7326a375ff7bcb60ce256e735e59570acd6d.zip
Merge pull request #219106 from m-bdf/nixos-testing-increase-device-timeout
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/testing/test-instrumentation.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 67fdc0ea433..6dc4091bad1 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -115,10 +115,12 @@ in
       ShowStatus=no
       # Allow very slow start
       DefaultTimeoutStartSec=300
+      DefaultDeviceTimeoutSec=300
     '';
     systemd.user.extraConfig = ''
       # Allow very slow start
       DefaultTimeoutStartSec=300
+      DefaultDeviceTimeoutSec=300
     '';
 
     boot.initrd.systemd.extraConfig = config.systemd.extraConfig;