picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #16483 from poettering/man-env-d-no-session

Browse source 
man: three minor fixes to environment.d/ man page
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-07-16 10:06:35 +02:00 committed by GitHub
parent 27806670ef 3f13f9159f
commit 40282752a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
man/environment.d.xml
View file

@ -22,7 +22,7 @@
<refnamediv> <refnamediv>
<refname>environment.d</refname> <refname>environment.d</refname>
<refpurpose>Definition of user session environment</refpurpose> <refpurpose>Definition of user service environment</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -36,8 +36,8 @@
<refsect1> <refsect1>
<title>Description</title> <title>Description</title>
<para>The <filename>environment.d</filename> directories contain a list of environment variable <para>Configuration files in the <filename>environment.d/</filename> directories contain lists of
assignments for services started by the systemd user instance. environment variable assignments for services started by the systemd user instance.
<citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
parses them and updates the environment exported by the systemd user instance. See below for an parses them and updates the environment exported by the systemd user instance. See below for an
discussion of which processes inherit those variables.</para> discussion of which processes inherit those variables.</para>
@ -58,7 +58,6 @@
variable assignments, separated by newlines. The right hand side of these assignments may variable assignments, separated by newlines. The right hand side of these assignments may
reference previously defined environment variables, using the <literal>${OTHER_KEY}</literal> reference previously defined environment variables, using the <literal>${OTHER_KEY}</literal>
and <literal>$OTHER_KEY</literal> format. It is also possible to use and <literal>$OTHER_KEY</literal> format. It is also possible to use
<literal>${<replaceable>FOO</replaceable>:-<replaceable>DEFAULT_VALUE</replaceable>}</literal> <literal>${<replaceable>FOO</replaceable>:-<replaceable>DEFAULT_VALUE</replaceable>}</literal>
to expand in the same way as <literal>${<replaceable>FOO</replaceable>}</literal> unless the to expand in the same way as <literal>${<replaceable>FOO</replaceable>}</literal> unless the
expansion would be empty, in which case it expands to <replaceable>DEFAULT_VALUE</replaceable>, expansion would be empty, in which case it expands to <replaceable>DEFAULT_VALUE</replaceable>,
@ -95,7 +94,7 @@
<para>Environment variables exported by the user manager (<command>systemd --user</command> instance <para>Environment variables exported by the user manager (<command>systemd --user</command> instance
started in the <filename>user@<replaceable>uid</replaceable>.service</filename> system service) apply to started in the <filename>user@<replaceable>uid</replaceable>.service</filename> system service) apply to
any services started by that manager. In particular, this may include services which run user shells. For any services started by that manager. In particular, this may include services which run user shells. For
example in the Gnome environment, the graphical terminal emulator runs as the example in the GNOME environment, the graphical terminal emulator runs as the
<filename>gnome-terminal-server.service</filename> user unit, which in turn runs the user shell, so that <filename>gnome-terminal-server.service</filename> user unit, which in turn runs the user shell, so that
shell will inherit environment variables exported by the user manager. For other instances of the shell, shell will inherit environment variables exported by the user manager. For other instances of the shell,
not launched by the user manager, the environment they inherit is defined by the program that starts not launched by the user manager, the environment they inherit is defined by the program that starts