X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.exec.xml;h=f96d181a9e83ad82358dfe510f8a5955df70b674;hb=a49408ec64063023524b964064d393c1fce36e4a;hp=b24792b0a088201d4a38d7ec5994479ee6083db3;hpb=5471472d441d9ac48640f11a3b07e6a1fd6d1b63;p=elogind.git
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index b24792b0a..f96d181a9 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -50,29 +50,32 @@
systemd.service,
systemd.socket,
- systemd.mount
+ systemd.mount,
+ systemd.swapDescriptionUnit configuration files for services, sockets
- and mount points share a subset of configuration
- options which define the execution environment of
- spawned processes.
+ mount points and swap devices share a subset of
+ configuration options which define the execution
+ environment of spawned processes.
This man page lists the configuration options
shared by these three unit types. See
systemd.unit5
for the common options of all unit configuration
files, and
- systemd.service5, systemd.socket5
+ systemd.service5,
+ systemd.socket5,
+ systemd.swap5
and
systemd.mount5
for more information on the specific unit
configuration files. The execution specific
configuration options are configured in the [Service],
- [Socket] resp. [Mount] section, depending on the unit
+ [Socket], [Mount] resp. [Swap] section, depending on the unit
type.
@@ -275,8 +278,23 @@
contain new-line separated variable
assignments. Empty lines and lines
starting with ; or # will be ignored,
- which may be used for
- commenting.
+ which may be used for commenting. The
+ argument passed should be an absolute
+ file name, optionally prefixed with
+ "-", which indicates that if the file
+ does not exist it won't be read and no
+ error or warning message is
+ logged. The files listed with this
+ directive will be read shortly before
+ the process is executed. Settings from
+ these files override settings made
+ with
+ Environment=. If
+ the same variable is set twice from
+ these files the files will be read in
+ the order they are specified and the
+ later setting will override the
+ earlier setting.
@@ -342,7 +360,9 @@
,
,
,
- or
+ ,
+ ,
+ or
. If set to
the file
descriptor of standard input is
@@ -366,9 +386,13 @@
system logger.
connects it with the kernel log buffer
which is accessible via
- dmesg1.
- connects standard output to a socket
- from socket activation, semantics are
+ dmesg1.
+ and work
+ similarly but copy the output to the
+ system console as
+ well. connects
+ standard output to a socket from
+ socket activation, semantics are
similar to the respective option of
StandardInput=.
This setting defaults to
@@ -398,7 +422,7 @@
/dev/console.
- SyslogIdentifer=
+ SyslogIdentifier=Sets the process name
to prefix log lines sent to syslog or
the kernel log buffer with. If not set
@@ -761,6 +785,7 @@
systemd.unit5,
systemd.service5,
systemd.socket5,
+ systemd.swap5,
systemd.mount5