Author: eelco
Date: 2010-06-20 19:22:23 +0000 (Sun, 20 Jun 2010)
New Revision: 22346

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22346&view=rev

Modified:
   nixos/branches/boot-order/modules/testing/test-instrumentation.nix

Log:
* 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.


Changes:

Modified: nixos/branches/boot-order/modules/testing/test-instrumentation.nix
===================================================================
--- nixos/branches/boot-order/modules/testing/test-instrumentation.nix  
2010-06-20 16:15:30 UTC (rev 22345)
+++ nixos/branches/boot-order/modules/testing/test-instrumentation.nix  
2010-06-20 19:22:23 UTC (rev 22346)
@@ -74,10 +74,8 @@
     # `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 {} "";

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to