X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=5c4bd6569f0ca7131281ea70fd58b8f7b57ae6a2;hb=730836403aee5f5bb998e6e3622ea7068fce0699;hp=1d804807721d5a613d51bf07ac75638791c11b73;hpb=8d0e0ddda6501479eb69164687c83c1a7667b33a;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 1d8048077..5c4bd6569 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -605,11 +605,12 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
time span value such as "5min
20s". Pass 0 to
disable the timeout logic. Defaults to
- TimeoutStartSec= from
+ DefaultTimeoutStartSec= from
the manager configuration file, except
when Type=oneshot is
used, in which case the timeout
- is disabled by default.
+ is disabled by default
+ (see systemd-systemd.conf5).
@@ -628,8 +629,9 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
time span value such as "5min
20s". Pass 0 to disable
the timeout logic. Defaults to
- TimeoutStartSec= from the
- manager configuration file.
+ DefaultTimeoutStopSec= from the
+ manager configuration file
+ (see systemd-systemd.conf5).
@@ -825,10 +827,15 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
- In addition to the above settings,
- the service will not be restarted if the
- exit code or signal is specified in
+ As exceptions to the setting
+ above the service will not be
+ restarted if the exit code or signal
+ is specified in
RestartPreventExitStatus=
+ (see below). Also, the services will
+ always be restarted if the exit code
+ or signal is specified in
+ RestartForceExitStatus=
(see below).Setting this to
@@ -838,8 +845,8 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
reliability by attempting automatic
recovery from errors. For services
that shall be able to terminate on
- their own choice (and avoiding
- immediate restart),
+ their own choice (and avoid
+ immediate restarting),
is an
alternative choice.
@@ -857,7 +864,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
definitions can either be numeric exit
codes or termination signal names,
separated by spaces. For example:
- SuccessExitStatus=1 2 8 SIGKILL
+ SuccessExitStatus=1 2 8 SIGKILL
ensures that exit codes 1, 2, 8 and
the termination signal
SIGKILL are
@@ -897,9 +904,8 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
spaces. Defaults to the empty list, so
that, by default, no exit status is
excluded from the configured restart
- logic. Example:
- RestartPreventExitStatus=1 6
- SIGABRT, ensures that exit
+ logic. For example:
+ RestartPreventExitStatus=1 6 SIGABRT ensures that exit
codes 1 and 6 and the termination
signal SIGABRT will
not result in automatic service
@@ -913,6 +919,18 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
effect.
+
+ RestartForceExitStatus=
+ Takes a list of exit
+ status definitions that when returned
+ by the main service process will force
+ automatic service restarts, regardless
+ of the restart setting configured with
+ Restart=. The
+ argument format is similar to
+ RestartPreventExitStatus=.
+
+
PermissionsStartOnly=Takes a boolean