Author: eelco
Date: Fri Mar 11 12:56:04 2011
New Revision: 26273
URL: https://svn.nixos.org/websvn/nix/?rev=26273&sc=1
Log:
* 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.
Modified:
nixos/trunk/modules/testing/test-instrumentation.nix
Modified: nixos/trunk/modules/testing/test-instrumentation.nix
==============================================================================
--- nixos/trunk/modules/testing/test-instrumentation.nix Fri Mar 11
12:18:01 2011 (r26272)
+++ nixos/trunk/modules/testing/test-instrumentation.nix Fri Mar 11
12:56:04 2011 (r26273)
@@ -86,9 +86,8 @@
# 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 "";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
