summaryrefslogtreecommitdiff
path: root/man/systemd.service.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-02-09 21:11:25 +0100
committerLennart Poettering <lennart@poettering.net>2012-02-09 21:11:25 +0100
commit02c4ef9c35e90ad562dc70fae25c81a8fd7f40f8 (patch)
tree2269cee05a4d86c22400df7237e5768c145fac7a /man/systemd.service.xml
parent092317d034df0dcde67e8696031557e82c3f7930 (diff)
service: imply NotifyAccess=main if WatchdogSec= is used
Diffstat (limited to 'man/systemd.service.xml')
-rw-r--r--man/systemd.service.xml24
1 files changed, 19 insertions, 5 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 513b4e5900..837a992ba4 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -198,8 +198,8 @@
below) should be set to open access to
the notification socket provided by
systemd. If
- <varname>NotifyAccess=</varname> is not
- set, it will implicitly be set to
+ <varname>NotifyAccess=</varname> is
+ not set, it will be implicitly set to
<option>main</option>.</para>
</listitem>
</varlistentry>
@@ -478,7 +478,15 @@
time configured here will be passed to
the executed service process in the
<varname>WATCHDOG_USEC=</varname>
- environment variable. Defaults to 0s,
+ environment variable. If
+ this option is used
+ <varname>NotifyAccess=</varname> (see
+ below) should be set to open access to
+ the notification socket provided by
+ systemd. If
+ <varname>NotifyAccess=</varname> is not
+ set, it will be implicitly set to
+ <option>main</option>. Defaults to 0,
which disables this
feature.</para></listitem>
</varlistentry>
@@ -687,10 +695,16 @@
accepted. If <option>all</option> all
services updates from all members of
the service's control group are
- accepted. This option must be set to
+ accepted. This option should be set to
open access to the notification socket
when using
- <varname>Type=notify</varname> (see above).</para></listitem>
+ <varname>Type=notify</varname> or
+ <varname>WatchdogUsec=</varname> (see
+ above). If those options are used but
+ <varname>NotifyAccess=</varname> not
+ configured it will be implicitly set
+ to
+ <option>main</option>.</para></listitem>
</varlistentry>
<varlistentry>