From 147142674992c29025b50f9818d7ac104e0de223 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Dec 2016 21:00:21 +0100 Subject: [PATCH] nixos/test-instrumentation: Fix eval of boot tests The boot tests import test-instrumentation.nix directly to create a VM image that only contains things such as the backdoor and serial console the same way as used by other NixOS VM tests. With one difference though: It doesn't need nor want to have 9p filesystems mounted, because we actually want to test an image rather than re-using most stuff from the host's store. Change tested against the boot.uefiUsb and ipv6 tests, just that it becomes clear we don't break either the tests with 9p nor the boot tests (which were already broken but now succeed). Signed-off-by: aszlig --- nixos/modules/testing/test-instrumentation.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 373bf766524..206df50a420 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -9,6 +9,15 @@ let kernel = config.boot.kernelPackages.kernel; in { + # This option is a dummy that if used in conjunction with + # modules/virtualisation/qemu-vm.nix gets merged with the same option defined + # there and only is declared here because some modules use + # test-instrumentation.nix but not qemu-vm.nix. + # + # One particular example are the boot tests where we want instrumentation + # within the images but not other stuff like setting up 9p filesystems. + options.virtualisation.qemu.program = mkOption { type = types.path; }; + config = { systemd.services.backdoor =