git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/test-instrumentation: properly import `options` for `qemu`-check

If `qemu-vm.nix` is imported, the option `virtualisation.qemu.consoles` should be set to make sure that the machine's output isn't rendered on the graphical window of QEMU. This is needed when interactively running a NixOS test or in conjunction with `nixos-build-vms(8)`. The patch 257855753073987160c293fdedc9d95a33cbc0e8 tries to only do this if the option actually exists, however this condition used to be always false since `options` wasn't imported in the module and pointed to `lib.options` due to the `with lib;`-clause.

commit2fbddb0ccb9ad539f1b4a96ea5bc0247dff6da25 authorMaximilian Bosch <maximilian@mbosch.me> dateTue 18 Aug 2020, 12:24 (6 years ago) parent644ecea
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 =