From 6160100a9ad6b9eee60b38b829d5a9da8ab9eba5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 11 Mar 2011 12:56:04 +0000 Subject: [PATCH] * Don't run klogd in tests to prevent duplicate kernel messages in the log output. (It wasn't running anyway because the preStart command was broken.) Note that "dmesg -c" doesn't have an effect on klogd, and "klogd -o" is broken. svn path=/nixos/trunk/; revision=26273 --- modules/testing/test-instrumentation.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix index 6c8f6cfa797..5fff8fc84e8 100644 --- a/modules/testing/test-instrumentation.nix +++ b/modules/testing/test-instrumentation.nix @@ -86,9 +86,8 @@ in # Send all of /var/log/messages to the serial port. services.syslogd.extraConfig = "*.* /dev/ttyS0"; - # Clear the kernel log buffer before starting klogd to prevent it - # from printing messages that we have already seen. - jobs.klogd.preStart = "dmesg -c > /dev/null"; + # Don't run klogd. Kernel messages appear on the serial console anyway. + jobs.klogd.startOn = mkOverride 50 ""; # Prevent tests from accessing the Internet. networking.defaultGateway = mkOverride 150 "";