From 1a5c18d1b603497e2a99ccee1b6834fc1769fdde Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Jul 2010 22:29:40 +0000
Subject: [PATCH] svn path=/nixos/trunk/; revision=22647

---
 modules/testing/test-instrumentation.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index f0922682b2a8..a22b280d9317 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -81,13 +81,13 @@ in
     networking.defaultGateway = mkOverride 150 {} "";
     networking.nameservers = mkOverride 150 {} [ ];
 
-    # Apply a patch to the kernel to increase the 15s CIFS timeout.
-    nixpkgs.config.packageOverrides = pkgs: {
-      linux = pkgs.linux.override (orig: {
-        kernelPatches = orig.kernelPatches ++ [ pkgs.kernelPatches.cifs_timeout ];
-      });
-    };
-
+    # Require a patch to the kernel to increase the 15s CIFS timeout.
+    assertions =
+      [ { assertion = config.boot.kernelPackages.kernel.features ? cifsTimeout;
+          message = "VM tests require that the kernel has the CIFS timeout patch.";
+        }
+      ];
+      
   };
 
 }