3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos/modules/virtualisation
aszlig fb9f5e4a03
nixos/testing: Fix output of systemd messages
Regression introduced by d4468bedb5.

No systemd messages are shown anymore during VM test runs, which is not
very helpful if you want to find out about failures.

There is a bit of a conflict between testing and the change that
introduced the regression. While the mentioned commit makes sure that
the primary console is tty0 for virtualisation.graphics = false, our VM
tests need to have the serial console as primary console.

So in order to support both, I added a new virtualisation.qemu.consoles
option, which allows to specify those options using the module system.

The default of this option is to use the changes that were introduced
and in test-instrumentation.nix we use only the serial console the same
way as before.

For test-instrumentation.nix I didn't add a baudrate to the serial
console because I can't find a reason on top of my head why it should
need it. There also wasn't a reason stated when that was introduced in
7499e4a5b9.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @dezgeg, @edolstra
2018-05-10 08:21:20 +02:00
..
amazon-image.nix
amazon-init.nix nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
amazon-options.nix
azure-agent-entropy.patch
azure-agent.nix azure-agent: add bash to service path. 2018-04-17 16:26:04 +02:00
azure-bootstrap-blobs.nix
azure-common.nix
azure-config-user.nix
azure-config.nix
azure-image.nix
azure-images.nix
azure-qemu-220-no-etc-install.patch
brightbox-config.nix
brightbox-image.nix nixos: rename config.system.nixos* -> config.system.nixos.* 2018-02-18 12:56:30 +00:00
container-config.nix nixos/containers: Enable use of the network.useHostResolvConf option (#34354) 2018-01-28 14:42:15 +00:00
containers.nix Merge pull request #35541 from xeji/containers-extraflags 2018-04-21 14:16:49 +01:00
docker-image.nix
docker.nix
ec2-amis.nix ec2-amis.nix: add 18.03 images 2018-04-05 11:58:53 +02:00
ec2-data.nix
ecs-agent.nix
gce-images.nix
google-compute-config.nix
google-compute-image.nix barf if pulling the ssh host keys fails 2018-04-28 17:07:54 +01:00
grow-partition.nix
hyperv-guest.nix
libvirtd.nix libvirt: 3.10.0 -> 4.1.0 2018-03-08 23:45:28 +00:00
lxc-container.nix
lxc.nix lxd: 2.16 -> 3.0.0 2018-04-14 11:02:24 +01:00
lxcfs.nix
lxd.nix lxd: 2.16 -> 3.0.0 2018-04-14 11:02:24 +01:00
nova-config.nix
openvswitch.nix nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
parallels-guest.nix parallels: add package config option 2018-03-01 17:09:13 -06:00
qemu-guest-agent.nix qemu-guest-agent: init module 2018-04-27 18:32:15 +09:00
qemu-vm.nix nixos/testing: Fix output of systemd messages 2018-05-10 08:21:20 +02:00
rkt.nix
virtualbox-guest.nix
virtualbox-host.nix virtualisation.virtualbox.host: migrate from mkOption to mkEnableOption 2018-05-01 22:47:54 +02:00
virtualbox-image.nix nixos: rename config.system.nixos* -> config.system.nixos.* 2018-02-18 12:56:30 +00:00
vmware-guest.nix
xe-guest-utilities.nix
xen-dom0.nix xen 4.10: link /etc/xen/oxenstored.conf 2018-03-07 22:39:19 +01:00
xen-domU.nix