X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=b1e3af2fefa485aead9214ad94c052c2fccc9b52;hb=202e6abb3d0959d8051d514ae48a140934a30f47;hp=5df554ca12d6f3a22ce7d23a300ad7e54aacbfc5;hpb=6b4991cfde6c0a0b62e836ca75ae362779c474d4;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 5df554ca1..b1e3af2fe 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -76,8 +76,8 @@
systemd.kill5,
which define the way the processes of the service are
terminated, and in
- systemd.cgroup5,
- which configure control group settings for the
+ systemd.resource-control5,
+ which configure resource control settings for the
processes of the service.
Unless DefaultDependencies=
@@ -140,13 +140,13 @@
If set to
(the default
value if BusName=
- is not specified) it is expected that
+ is not specified), it is expected that
the process configured with
ExecStart= is the
main process of the service. In this
mode, if the process offers
functionality to other processes on
- the system its communication channels
+ the system, its communication channels
should be installed before the daemon
is started up (e.g. sockets set up by
systemd, via socket activation), as
@@ -154,14 +154,14 @@
starting follow-up units.If set to
- it is
+ , it is
expected that the process configured
with ExecStart=
will call fork()
as part of its start-up. The parent process is
expected to exit when start-up is
complete and all communication
- channels set up. The child continues
+ channels are set up. The child continues
to run as the main daemon
process. This is the behavior of
traditional UNIX daemons. If this
@@ -210,14 +210,18 @@
starting up. systemd will proceed
starting follow-up units after this
notification message has been sent. If
- this option is used
+ this option is used,
NotifyAccess= (see
below) should be set to open access to
the notification socket provided by
systemd. If
NotifyAccess= is
not set, it will be implicitly set to
- .
+ . Note that
+ currently
+ Type=
+ will not work if used in combination with
+ PrivateNetwork=.Behavior of
is very similar
@@ -258,7 +262,7 @@
guessing algorithm might come to
incorrect conclusions if a daemon
consists of more than one process. If
- the main PID cannot be determined
+ the main PID cannot be determined,
failure detection and automatic
restarting of a service will not work
reliably. Defaults to
@@ -323,7 +327,7 @@
.desktop files.
Lone semicolons may be escaped as
\;. If the empty
- string is assigned to this option the
+ string is assigned to this option, the
list of commands to start is reset,
prior assignments of this option will
have no effect.
@@ -365,7 +369,8 @@
case it will be replaced by the value
of the environment variable split up
at whitespace, resulting in zero or
- more arguments. Note that the first
+ more arguments. To pass a literal dollar sign,
+ use $$. Note that the first
argument (i.e. the program to execute)
may not be a variable, since it must
be a literal and absolute path
@@ -379,19 +384,19 @@
executed process, followed by the
further arguments specified. If the
absolute filename is prefixed with
- - an exit code of
+ -, an exit code of
the command normally considered a
failure (i.e. non-zero exit status or
abnormal exit due to signal) is ignored
and considered success. If both
- and
- @ are used they
+ @ are used, they
can appear in either order.
Note that this setting does not
directly support shell command
lines. If shell command lines are to
- be used they need to be passed
+ be used, they need to be passed
explicitly to a shell implementation
of some kind. Example:ExecStart=/bin/sh -c 'dmesg | tac'
@@ -467,7 +472,7 @@
KillMode= setting
(see
systemd.kill5). If
- this option is not specified the
+ this option is not specified, the
process is terminated right-away when
service stop is requested. Specifier
and environment variable substitution
@@ -563,11 +568,11 @@
regularly with "WATCHDOG=1" (i.e. the
"keep-alive ping"). If the time
between two such calls is larger than
- the configured time then the service
+ the configured time, then the service
is placed in a failure state. By
setting Restart= to
or
- the service
+ , the service
will be automatically restarted. The
time configured here will be passed to
the executed service process in the
@@ -576,7 +581,7 @@
daemons to automatically enable the
keep-alive pinging logic if watchdog
support is enabled for the service. If
- this option is used
+ this option is used,
NotifyAccess= (see
below) should be set to open access to
the notification socket provided by
@@ -614,11 +619,12 @@
,
,
,
+ ,
, or
. If set to
- (the default) the
+ (the default), the
service will not be restarted. If set to
- it will be
+ , it will be
restarted only when the service process
exits cleanly.
In this context, a clean exit means
@@ -626,7 +632,7 @@
SIGHUP, SIGINT, SIGTERM, or SIGPIPE, and
additionally, exit statuses and signals
specified in SuccessExitStatus=.
- If set to
+ If set to ,
the service will be restarted when the
process exits with an nonzero exit code,
is terminated by a signal (including on
@@ -634,13 +640,17 @@
service reload) times out, and when the
configured watchdog timeout is triggered.
If set to
- the service
+ , the service
will be restarted only if the service
process exits due to an uncaught
signal not specified as a clean exit
status.
If set to
- the service
+ , the service
+ will be restarted only if the watchdog
+ timeout for the service expires.
+ If set to
+ , the service
will be restarted regardless whether
it exited cleanly or not, got
terminated abnormally by a signal or
@@ -673,7 +683,7 @@
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
+ assigned to this option, the list is
reset, all prior assignments of this
option will have no
effect.
@@ -703,7 +713,7 @@
option may appear more than once in
which case the list of restart preventing
statuses is merged. If the empty
- string is assigned to this option the
+ string is assigned to this option, the
list is reset, all prior assignments
of this option will have no
effect.
@@ -781,13 +791,13 @@
(the default),
or
. If
- no daemon status
+ , no daemon status
updates are accepted from the service
processes, all status update messages
- are ignored. If
+ are ignored. If ,
only service updates sent from the
main process of the service are
- accepted. If all
+ accepted. If , all
services updates from all members of
the service's control group are
accepted. This option should be set to
@@ -796,8 +806,8 @@
Type=notify or
WatchdogSec= (see
above). If those options are used but
- NotifyAccess= not
- configured it will be implicitly set
+ NotifyAccess= is not
+ configured, it will be implicitly set
to
.
@@ -832,7 +842,7 @@
This option may appear more than
once, in which case the list of socket
units is merged. If the empty string
- is assigned to this option the list of
+ is assigned to this option, the list of
sockets is reset, all prior uses of
this setting will have no
effect.
@@ -843,12 +853,12 @@
StartLimitBurst=Configure service
- start rate limiting. By default
+ start rate limiting. By default,
services which are started more often
than 5 times within 10s are not
permitted to start any more times
until the 10s interval ends. With
- these two options this rate limiting
+ these two options, this rate limiting
may be modified. Use
StartLimitInterval=
to configure the checking interval
@@ -960,33 +970,6 @@
range 0-99.
-
- FsckPassNo=
- Set the fsck passno
- priority to use to order this service
- in relation to other file system
- checking services. This option is only
- necessary to fix ordering in relation
- to fsck jobs automatically created for
- all /etc/fstab
- entries with a value in the fs_passno
- column > 0. As such it should only be
- used as option for fsck
- services. Almost always it is a better
- choice to add explicit ordering
- directives via
- After= or
- Before=,
- instead. For more details see
- systemd.unit5. If
- used, pass an integer value in the
- same range as
- /etc/fstab's
- fs_passno column. See
- fstab5
- for details.
-
-
@@ -997,7 +980,7 @@
systemctl8,
systemd.unit5,
systemd.exec5,
- systemd.cgroup5,
+ systemd.resource-control5,
systemd.kill5,
systemd.directives7