JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #95743 from Ma27/qemu-test-out

Browse Source 
nixos/test-instrumentation: properly import `options` for `qemu`-check
This commit is contained in:
Silvan Mosberger 2020-08-18 14:29:50 +02:00 committed by GitHub
commit cfd599e117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/testing/test-instrumentation.nix
View File

@ -1,22 +1,13 @@
# This module allows the test driver to connect to the virtual machine # This module allows the test driver to connect to the virtual machine
# via a root shell attached to port 514. # via a root shell attached to port 514.
{ config, lib, pkgs, ... }: { options, config, lib, pkgs, ... }:
with lib; with lib;
with import ../../lib/qemu-flags.nix { inherit pkgs; }; with import ../../lib/qemu-flags.nix { inherit pkgs; };
{ {
# 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 = { };
config = { config = {
systemd.services.backdoor = systemd.services.backdoor =