1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
nixpkgs/nixos/modules
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
..
config treewide: isArm -> isAarch32 2018-04-25 15:28:55 -04:00
hardware Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
i18n/input-method Added cross-references to NixOS manual 2018-04-12 09:39:14 +10:00
installer nix: 2.0.1 -> 2.0.2 2018-05-04 13:28:36 +02:00
misc nixos/documentation: Correct use of lib.optional 2018-05-05 15:55:53 +07:00
profiles base profile: add mkpasswd to system packages 2018-05-09 00:20:02 +03:00
programs Merge pull request #38831 from rdnetto/improve-cross-refs 2018-04-30 21:30:20 -04:00
security Merge pull request #39526 (improve dhparams) 2018-05-08 02:09:46 +02:00
services Merge pull request #39671 from johanot/keepalived-vrrpInstanceTracking 2018-05-09 20:54:36 +02:00
system Merge pull request #40052 from flokli/input_leds-doc 2018-05-09 07:54:47 +00:00
tasks lxd: 2.16 -> 3.0.0 2018-04-14 11:02:24 +01:00
testing nixos/testing: Fix output of systemd messages 2018-05-10 08:21:20 +02:00
virtualisation nixos/testing: Fix output of systemd messages 2018-05-10 08:21:20 +02:00
module-list.nix Merge pull request #39099 from teto/qemu_agent 2018-05-10 01:22:52 +02:00
rename.nix NetworkManager: add noDns option 2018-05-08 13:42:39 +02:00