diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-19 17:32:50 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-19 17:32:50 -0400 |
| commit | 6419172bc2c3b07c6769479a7cfc07806143e32b (patch) | |
| tree | a4fc194c9e9a32c985809deded42af165a6d1d28 /modules/testing/test-instrumentation.nix | |
| parent | 425ec4cb00d09a0803d9cc8cdbc554661c704a8a (diff) | |
| download | nixpkgs-6419172bc2c3b07c6769479a7cfc07806143e32b.tar nixpkgs-6419172bc2c3b07c6769479a7cfc07806143e32b.tar.gz nixpkgs-6419172bc2c3b07c6769479a7cfc07806143e32b.tar.bz2 nixpkgs-6419172bc2c3b07c6769479a7cfc07806143e32b.tar.lz nixpkgs-6419172bc2c3b07c6769479a7cfc07806143e32b.tar.xz nixpkgs-6419172bc2c3b07c6769479a7cfc07806143e32b.tar.zst nixpkgs-6419172bc2c3b07c6769479a7cfc07806143e32b.zip | |
journald: enable logging to the console
Diffstat (limited to 'modules/testing/test-instrumentation.nix')
| -rw-r--r-- | modules/testing/test-instrumentation.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix index ce9c1cea743..c81f6eaac65 100644 --- a/modules/testing/test-instrumentation.nix +++ b/modules/testing/test-instrumentation.nix @@ -66,15 +66,8 @@ with pkgs.lib; # `xwininfo' is used by the test driver to query open windows. environment.systemPackages = [ pkgs.xorg.xwininfo ]; - # Send all of /var/log/messages to the serial port. - services.syslogd.extraConfig = "*.* /dev/ttyS0"; - - # Disable "-- MARK --" messages. These prevent hanging tests from - # being killed after 1 hour of silence. - services.syslogd.extraParams = [ "-m 0" ]; - - # Don't run klogd. Kernel messages appear on the serial console anyway. - jobs.klogd.startOn = mkOverride 50 ""; + # Log everything to the serial console. + services.journald.console = "/dev/console"; # Prevent tests from accessing the Internet. networking.defaultGateway = mkOverride 150 ""; |