summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2013-11-08 16:01:22 +0100
committerLukas Nykryn <lnykryn@redhat.com>2013-11-08 17:00:01 +0100
commit3f41e1e5955552a771748225334b3e8a7eb02b8a (patch)
treec855ed7a54f576cd83b3eef3a9cfcacd20ab080d /man
parent1290d0fc5f7ffb433e403068c6c60394033e9ba8 (diff)
manager: configurable StartLimit default values
https://bugzilla.redhat.com/show_bug.cgi?id=821723
Diffstat (limited to 'man')
-rw-r--r--man/systemd-system.conf.xml13
-rw-r--r--man/systemd.service.xml9
2 files changed, 19 insertions, 3 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 2a0a10c05b..fd898f75b9 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -115,6 +115,19 @@
<varname>TimeoutSec=</varname> value.
</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term><varname>DefaultStartLimitInterval=</varname></term>
+ <term><varname>DefaultStartLimitBurst=</varname></term>
+
+ <listitem><para>Configure the default start rate
+ limiting, as configured per-service by
+ <varname>StartLimitInterval=</varname> and
+ <varname>StartLimitBurst=</varname>. See
+ <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ for details on the per-service
+ settings).
+ </para></listitem>
+ </varlistentry>
<varlistentry>
<term><varname>CPUAffinity=</varname></term>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index d1f4a2d7d7..22c0d5ae9f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -863,12 +863,15 @@
these two options, this rate limiting
may be modified. Use
<varname>StartLimitInterval=</varname>
- to configure the checking interval
- (defaults to 10s, set to 0 to disable
+ to configure the checking interval (defaults to
+ <varname>DefaultStartLimitInterval=</varname> in
+ manager configuration file, set to 0 to disable
any kind of rate limiting). Use
<varname>StartLimitBurst=</varname> to
configure how many starts per interval
- are allowed (defaults to 5). These
+ are allowed (defaults to
+ <varname>DefaultStartLimitBurst=</varname> in
+ manager configuration file). These
configuration options are particularly
useful in conjunction with
<varname>Restart=</varname>, however