git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95743 from Ma27/qemu-test-out

nixos/test-instrumentation: properly import `options` for `qemu`-check

commitcfd599e1177f21e594147ee772ed6bab654fa20d authorSilvan Mosberger <contact@infinisil.com> dateTue 18 Aug 2020, 14:29 (6 years ago) parent6622ba52fbddb0
1 file changed+1−10
nixos/modules/testing/test-instrumentation.nix+1−10
nixos/modules/testing/test-instrumentation.nix+1−10
@@ -1,22 +1,13 @@
11# This module allows the test driver to connect to the virtual machine
22# via a root shell attached to port 514.
33
4−{ config, lib, pkgs, ... }:
4+{ options, config, lib, pkgs, ... }:
55
66with lib;
77with import ../../lib/qemu-flags.nix { inherit pkgs; };
88
99{
1010
11− # This option is a dummy that if used in conjunction with
12− # modules/virtualisation/qemu-vm.nix gets merged with the same option defined
13− # there and only is declared here because some modules use
14− # test-instrumentation.nix but not qemu-vm.nix.
15− #
16− # One particular example are the boot tests where we want instrumentation
17− # within the images but not other stuff like setting up 9p filesystems.
18− options.virtualisation.qemu = { };
19−
2011 config = {
2112
2213 systemd.services.backdoor =