summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-10 21:39:36 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-10 23:48:50 +0100
commitbe73bb486a1a1bb43a04319c3cb0b639edd6b98f (patch)
tree532a01152b6cb8be37eae72877bb62ecf32684df /man
parent41448597f2289c570e96315abf34adab4ff204e1 (diff)
man: document that [Install] has no effect in unit file .d/*.conf drop-ins
Fixes: #1774 Fixes: #1090
Diffstat (limited to 'man')
-rw-r--r--man/systemd.unit.xml36
1 files changed, 15 insertions, 21 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 04c4515cd9..16aded89d1 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -178,18 +178,14 @@
directory suffix is <filename>.requires/</filename> in this
case.</para>
- <para>Along with a unit file <filename>foo.service</filename>, a
- directory <filename>foo.service.d/</filename> may exist. All files
- with the suffix <literal>.conf</literal> from this directory will
- be parsed after the file itself is parsed. This is useful to alter
- or add configuration settings to a unit, without having to modify
- their unit files. Make sure that the file that is included has the
- appropriate section headers before any directive. Note that, for
- instanced units, this logic will first look for the instance
- <literal>.d/</literal> subdirectory and read its
- <literal>.conf</literal> files, followed by the template
- <literal>.d/</literal> subdirectory and reads its
- <literal>.conf</literal> files.</para>
+ <para>Along with a unit file <filename>foo.service</filename>, a "drop-in" directory
+ <filename>foo.service.d/</filename> may exist. All files with the suffix <literal>.conf</literal> from this
+ directory will be parsed after the file itself is parsed. This is useful to alter or add configuration settings to
+ a unit, without having to modify their unit files. Make sure that the file that is included has the appropriate
+ section headers before any directive. Note that for instanced units, this logic will first look for the instance
+ <literal>.d/</literal> subdirectory and read its <literal>.conf</literal> files, followed by the template
+ <literal>.d/</literal> subdirectory and reads its <literal>.conf</literal> files. Also note that settings from the
+ <literal>[Install]</literal> section are not available in drop-in unit files, and have no effect.</para>
<para>In addition to <filename>/etc/systemd/system</filename>,
the drop-in <literal>.conf</literal> files for system services
@@ -1093,15 +1089,13 @@
<refsect1>
<title>[Install] Section Options</title>
- <para>Unit file may include an <literal>[Install]</literal>
- section, which carries installation information for the unit. This
- section is not interpreted by
- <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- during runtime. It is used exclusively by the
- <command>enable</command> and <command>disable</command> commands
- of the
- <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- tool during installation of a unit:</para>
+ <para>Unit files may include an <literal>[Install]</literal> section, which carries installation information for
+ the unit. This section is not interpreted by
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> during runtime; it is
+ used by the <command>enable</command> and <command>disable</command> commands of the
+ <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> tool during
+ installation of a unit. Note that settings in the <literal>[Install]</literal> section may not appear in
+ <filename>.d/*.conf</filename> unit file drop-ins (see above).</para>
<variablelist class='unit-directives'>
<varlistentry>