about summary refs log tree commit diff
path: root/nixos/modules/testing
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2016-12-15 13:49:15 +0100
committerEelco Dolstra <edolstra@gmail.com>2016-12-20 10:52:46 +0100
commitaad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf (patch)
treef0c7eba8df6bfb40b7666c0dbb6272c6a031ddd9 /nixos/modules/testing
parent8a0843c3c4929d38b9a79f61449fc63c6a27e4a0 (diff)
downloadnixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.gz
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.bz2
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.lz
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.xz
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.zst
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.zip
virtualisation.qemu.program: Remove
This option is defined in qemu-vm.nix, but that module is not always
imported.

http://hydra.nixos.org/build/44817443
(cherry picked from commit 03c55005dfd6fbcd5cf8e00128a3bb6336b3bc0f)
Diffstat (limited to 'nixos/modules/testing')
-rw-r--r--nixos/modules/testing/test-instrumentation.nix3
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 206df50a4207..099ead3d846c 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -119,9 +119,6 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     networking.usePredictableInterfaceNames = false;
 
-    # Make sure we use a patched QEMU that ignores file ownership.
-    virtualisation.qemu.program = "${pkgs.qemu_test}/bin/qemu-kvm";
-
     # Make it easy to log in as root when running the test interactively.
     users.extraUsers.root.initialHashedPassword = mkOverride 150 "";