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

svn path=/nixos/trunk/; revision=28393

1 files changed, 12 insertions, 3 deletions

diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix
index 083568b51e30..bb088c250f6b 100644
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@@ -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}";
       };
 
   };