From d48e2fdb4d01094ae2d8d00c1e505ba21cefec78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 17:36:01 +0000
Subject: [PATCH] * Don't print kernel log messages twice.

svn path=/nixos/trunk/; revision=23769
---
 modules/testing/test-instrumentation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 6f47a6a9c39..5ff7201acd3 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -77,6 +77,10 @@ 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";
+
     # Prevent tests from accessing the Internet.
     networking.defaultGateway = mkOverrideTemplate 150 {} "";
     networking.nameservers = mkOverrideTemplate 150 {} [ ];