From 593a110c4715a21a6973bf76a1ef1df30b2611d9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 20 Jun 2010 19:22:23 +0000 Subject: [PATCH] * Make sure that kernel log messages appear in the VM output. The comment was incorrect - when klogd is running, kernel messages no longer appear on the serial port. svn path=/nixos/branches/boot-order/; revision=22346 --- modules/testing/test-instrumentation.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix index 655cda31ed65..268a208e7fa6 100644 --- a/modules/testing/test-instrumentation.nix +++ b/modules/testing/test-instrumentation.nix @@ -74,10 +74,8 @@ in # `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 (except for - # kernel messages through klogd, which already appear on the - # serial port). - services.syslogd.extraConfig = "*.*,kern.none /dev/ttyS0"; + # Send all of /var/log/messages to the serial port. + services.syslogd.extraConfig = "*.* /dev/ttyS0"; # Prevent tests from accessing the Internet. networking.defaultGateway = mkOverride 200 {} "";