Author: eelco
Date: Mon Aug 8 14:40:16 2011
New Revision: 28393
URL: https://svn.nixos.org/websvn/nix/?rev=28393&sc=1
Log:
* In the VM tests, add "-m 0" to syslogd to kill the "-- MARK --"
messages. These prevent hanging tests from being killed after 1
hour of silence.
Modified:
nixos/trunk/modules/services/logging/syslogd.nix
nixos/trunk/modules/testing/test-instrumentation.nix
Modified: nixos/trunk/modules/services/logging/syslogd.nix
==============================================================================
--- nixos/trunk/modules/services/logging/syslogd.nix Mon Aug 8 14:12:07
2011 (r28392)
+++ nixos/trunk/modules/services/logging/syslogd.nix Mon Aug 8 14:40:16
2011 (r28393)
@@ -27,8 +27,6 @@
*.*;mail.none;local1.none -/var/log/messages
'';
- syslogdParameters = if cfg.enableNetworkInput then "-r " else "";
-
in
{
@@ -75,6 +73,15 @@
'';
};
+ extraParams = mkOption {
+ type = types.listOf types.string;
+ default = [ ];
+ example = [ "-m 0" ];
+ description = ''
+ Additional parameters passed to <command>syslogd</command>.
+ '';
+ };
+
};
};
@@ -84,6 +91,8 @@
config = {
+ services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
+
jobs.syslogd =
{ description = "Syslog daemon";
@@ -93,7 +102,7 @@
daemonType = "fork";
- exec = "${pkgs.sysklogd}/sbin/syslogd ${syslogdParameters} -f
${syslogConf}";
+ exec = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f
${syslogConf}";
};
};
Modified: nixos/trunk/modules/testing/test-instrumentation.nix
==============================================================================
--- nixos/trunk/modules/testing/test-instrumentation.nix Mon Aug 8
14:12:07 2011 (r28392)
+++ nixos/trunk/modules/testing/test-instrumentation.nix Mon Aug 8
14:40:16 2011 (r28393)
@@ -92,6 +92,10 @@
# Send all of /var/log/messages to the serial port.
services.syslogd.extraConfig = "*.* /dev/ttyS0";
+ # Disable "-- MARK --" messages. These prevent hanging tests from
+ # being killed after 1 hour of silence.
+ services.syslogd.extraParams = [ "-m 0" ];
+
# Don't run klogd. Kernel messages appear on the serial console anyway.
jobs.klogd.startOn = mkOverride 50 "";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
