svn path=/nixos/trunk/; revision=22647

This commit is contained in:
Eelco Dolstra 2010-07-18 22:29:40 +00:00
parent b14f80c89a
commit 1a5c18d1b6

View File

@ -81,12 +81,12 @@ in
networking.defaultGateway = mkOverride 150 {} ""; networking.defaultGateway = mkOverride 150 {} "";
networking.nameservers = mkOverride 150 {} [ ]; networking.nameservers = mkOverride 150 {} [ ];
# Apply a patch to the kernel to increase the 15s CIFS timeout. # Require a patch to the kernel to increase the 15s CIFS timeout.
nixpkgs.config.packageOverrides = pkgs: { assertions =
linux = pkgs.linux.override (orig: { [ { assertion = config.boot.kernelPackages.kernel.features ? cifsTimeout;
kernelPatches = orig.kernelPatches ++ [ pkgs.kernelPatches.cifs_timeout ]; message = "VM tests require that the kernel has the CIFS timeout patch.";
}); }
}; ];
}; };