summaryrefslogtreecommitdiff
path: root/man/systemd.exec.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-20 12:24:43 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-20 12:24:43 +0100
commit1bd4903c8faab8af259ecb35bbad05d938e250c5 (patch)
treeeb0c85dfcf7f71df0be3bac96f240a8a9572ad25 /man/systemd.exec.xml
parentfd4f59076ec35cd20c3b424a41e405a1062fbe8d (diff)
parent5c019cf2602c035bb47bc59f71939ad53d6a9294 (diff)
Merge pull request #1950 from evverx/man-systemd-exec-env
man: systemd.exec: add missing variables
Diffstat (limited to 'man/systemd.exec.xml')
-rw-r--r--man/systemd.exec.xml23
1 files changed, 21 insertions, 2 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 6dda6c5e69..ecc3a8973c 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1381,6 +1381,7 @@
<varlistentry>
<term><varname>$LISTEN_FDS</varname></term>
<term><varname>$LISTEN_PID</varname></term>
+ <term><varname>$LISTEN_FDNAMES</varname></term>
<listitem><para>Information about file descriptors passed to a
service for socket activation. See
@@ -1389,6 +1390,24 @@
</varlistentry>
<varlistentry>
+ <term><varname>$NOTIFY_SOCKET</varname></term>
+
+ <listitem><para>The socket
+ <function>sd_notify()</function> talks to. See
+ <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>$WATCHDOG_PID</varname></term>
+ <term><varname>$WATCHDOG_USEC</varname></term>
+
+ <listitem><para>Information about watchdog keep-alive notifications. See
+ <citerefentry><refentrytitle>sd_watchdog_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>$TERM</varname></term>
<listitem><para>Terminal type, set only for units connected to
@@ -1402,8 +1421,8 @@
<para>Additional variables may be configured by the following
means: for processes spawned in specific units, use the
- <varname>Environment=</varname> and
- <varname>EnvironmentFile=</varname> options above; to specify
+ <varname>Environment=</varname>, <varname>EnvironmentFile=</varname>
+ and <varname>PassEnvironment=</varname> options above; to specify
variables globally, use <varname>DefaultEnvironment=</varname>
(see
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>)