summary refs log tree commit diff
path: root/modules/testing/test-instrumentation.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-09-13 17:36:01 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-09-13 17:36:01 +0000
commitd48e2fdb4d01094ae2d8d00c1e505ba21cefec78 (patch)
tree3c0a273e247284af6456c3fe56d4783952c254ac /modules/testing/test-instrumentation.nix
parentc8d1774f0977325ffa5bab56487ae48e072b3f2d (diff)
downloadnixpkgs-d48e2fdb4d01094ae2d8d00c1e505ba21cefec78.tar
nixpkgs-d48e2fdb4d01094ae2d8d00c1e505ba21cefec78.tar.gz
nixpkgs-d48e2fdb4d01094ae2d8d00c1e505ba21cefec78.tar.bz2
nixpkgs-d48e2fdb4d01094ae2d8d00c1e505ba21cefec78.tar.lz
nixpkgs-d48e2fdb4d01094ae2d8d00c1e505ba21cefec78.tar.xz
nixpkgs-d48e2fdb4d01094ae2d8d00c1e505ba21cefec78.tar.zst
nixpkgs-d48e2fdb4d01094ae2d8d00c1e505ba21cefec78.zip
* Don't print kernel log messages twice.
svn path=/nixos/trunk/; revision=23769
Diffstat (limited to 'modules/testing/test-instrumentation.nix')
-rw-r--r--modules/testing/test-instrumentation.nix4
1 files changed, 4 insertions, 0 deletions
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 {} [ ];