X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=5b3afb86d2c64d65830bc75c61c6e68fca25ad89;hb=79fbcd8869f5d2d0236f7272bf45ba6b3d4abbea;hp=be9bdcaf99689d5e03d34ac3090f6ce0fdcebfca;hpb=bcddd5bf8033b0c9cb15a9d017b7714ebe21473a;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index be9bdcaf9..5b3afb86d 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -674,7 +674,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
processes specified with
ExecStartPre=,
ExecStartPost=,
- ExecStopPre=,
+ ExecStop=,
ExecStopPost=, or
ExecReload=.
When the death of the process is a
@@ -747,33 +747,30 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
SIGTERM, and SIGPIPE. Exit status
definitions can either be numeric exit
codes or termination signal names,
- separated by spaces. Signals will only
- be considered if the service does not implement
- a signal handler and exits as a direct result
- of receiving the signal. For example:
- SuccessExitStatus=1 2 8 SIGKILL
- ensures that exit codes 1, 2, 8 and
- the termination signal
- SIGKILL are
- considered clean service terminations.
-
-
- Note that if a process has a
- signal handler installed and exits by
- calling
- _exit2
- in response to a signal, the
- information about the signal is lost.
- Programs should instead perform cleanup and kill themselves with the same signal instead. See
- Proper handling of SIGINT/SIGQUIT â How to be a proper program.
-
- This option may appear more than once
- in which case the list of successful
- exit statuses is merged. If the empty
- string is assigned to this option, the
- list is reset, all prior assignments
- of this option will have no
- effect.
+ separated by spaces. For example:
+ SuccessExitStatus=1 2 8 SIGKILL
+ ensures that exit codes 1, 2, 8 and
+ the termination signal
+ SIGKILL are
+ considered clean service terminations.
+
+
+ Note that if a process has a
+ signal handler installed and exits by
+ calling
+ _exit2
+ in response to a signal, the
+ information about the signal is lost.
+ Programs should instead perform cleanup and kill themselves with the same signal instead. See
+ Proper handling of SIGINT/SIGQUIT â How to be a proper program.
+
+ This option may appear more than once,
+ in which case the list of successful
+ exit statuses is merged. If the empty
+ string is assigned to this option, the
+ list is reset, all prior assignments
+ of this option will have no
+ effect.
@@ -861,7 +858,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
for all file descriptors passed via
socket-based activation. If true, all
file descriptors >= 3 (i.e. all except
- STDIN/STDOUT/STDERR) will have
+ stdin, stdout, and stderr) will have
the O_NONBLOCK flag
set and hence are in
non-blocking mode. This option is only