diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2016-11-30 03:22:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 03:22:07 +0300 |
| commit | 97506e85e2cf8c726939a872239698d5279a1cfc (patch) | |
| tree | ca1b82f105f2aed4210fda0ccdacda83bf6d8a9b /man | |
| parent | e7330dfe14b1965fe8a2e25df248f45d46cfb26d (diff) | |
| parent | 6375bd2007412b401e8aa528d70d5866057f6fe5 (diff) | |
Merge pull request #4745 from joukewitteveen/notify
Improvements for notify services (including #4212)
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.exec.xml | 6 | ||||
| -rw-r--r-- | man/systemd.service.xml | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index abc275aad0..ab83876eba 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1772,9 +1772,9 @@ <listitem><para>Only defined for the service unit type, this environment variable is passed to all <varname>ExecStop=</varname> and <varname>ExecStopPost=</varname> processes, and encodes the service "result". Currently, the following values are defined: <literal>protocol</literal> (in case of a protocol - violation; if a service did not take the steps required by its configuration), <literal>timeout</literal> (in - case of an operation timeout), <literal>exit-code</literal> (if a service process exited with a non-zero exit - code; see <varname>$EXIT_CODE</varname> below for the actual exit code returned), <literal>signal</literal> + violation; if a service did not take the steps required by its unit configuration), <literal>timeout</literal> + (in case of an operation timeout), <literal>exit-code</literal> (if a service process exited with a non-zero + exit code; see <varname>$EXIT_CODE</varname> below for the actual exit code returned), <literal>signal</literal> (if a service process was terminated abnormally by a signal; see <varname>$EXIT_CODE</varname> below for the actual signal used for the termination), <literal>core-dump</literal> (if a service process terminated abnormally and dumped core), <literal>watchdog</literal> (if the watchdog keep-alive ping was enabled for the diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 3ba6ab34db..67c68d2f8b 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -798,11 +798,14 @@ notification socket, as accessible via the <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry> call. Takes one of <option>none</option> (the default), - <option>main</option> or <option>all</option>. If - <option>none</option>, no daemon status updates are accepted - from the service processes, all status update messages are - ignored. If <option>main</option>, only service updates sent - from the main process of the service are accepted. If + <option>main</option>, <option>exec</option> or + <option>all</option>. If <option>none</option>, no daemon status + updates are accepted from the service processes, all status + update messages are ignored. If <option>main</option>, only + service updates sent from the main process of the service are + accepted. If <option>exec</option>, only service updates sent + from any of the control processes originating from one of the + <varname>Exec*=</varname> commands are accepted. If <option>all</option>, all services updates from all members of the service's control group are accepted. This option should be set to open access to the notification socket when using |