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

Merge pull request #95584 from hercules-ci/fix-nixos-test-instrumentation

Browse Source 
nixos/test-instrumentation.nix: Fix evaluation error
This commit is contained in:
Robert Hensing 2020-08-16 13:59:50 +02:00 committed by GitHub
commit cf568e31f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,12 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
systemd.services."serial-getty@hvc0".enable = false; systemd.services."serial-getty@hvc0".enable = false;
# Only use a serial console, no TTY. # Only use a serial console, no TTY.
virtualisation.qemu.consoles = [ qemuSerialDevice ]; # NOTE: optionalAttrs
# test-instrumentation.nix appears to be used without qemu-vm.nix, so
# we avoid defining consoles if not possible.
# TODO: refactor such that test-instrumentation can import qemu-vm
# or declare virtualisation.qemu.console option in a module that's always imported
virtualisation = lib.optionalAttrs (options ? virtualisation.qemu.consoles) { qemu.consoles = [ qemuSerialDevice ]; };
boot.initrd.preDeviceCommands = boot.initrd.preDeviceCommands =
'' ''