jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* In the VM tests, add "-m 0" to syslogd to kill the "-- MARK --"

Browse Source 
messages.  These prevent hanging tests from being killed after 1
  hour of silence.

svn path=/nixos/trunk/; revision=28393
This commit is contained in:
Eelco Dolstra 2011-08-08 14:40:16 +00:00
parent 843ccae5d5
commit 8b30a8f23f
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/services/logging/syslogd.nix
View File

@ -27,8 +27,6 @@ let
*.*;mail.none;local1.none -/var/log/messages
'';
syslogdParameters = if cfg.enableNetworkInput then "-r " else "";
in
{
@ -75,6 +73,15 @@ in
'';
};
extraParams = mkOption {
type = types.listOf types.string;
default = [ ];
example = [ "-m 0" ];
description = ''
Additional parameters passed to <command>syslogd</command>.
'';
};
};
};
@ -84,6 +91,8 @@ in
config = {
services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
jobs.syslogd =
{ description = "Syslog daemon";
@ -93,7 +102,7 @@ in
daemonType = "fork";
exec = "${pkgs.sysklogd}/sbin/syslogd ${syslogdParameters} -f ${syslogConf}";
exec = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf}";
};
};

4
modules/testing/test-instrumentation.nix
View File

@ -92,6 +92,10 @@ in
# 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 "";