shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 10:25:06 +03:00
Code

Merge pull request #2409 from snakeroot/dropin-doc-2

Browse Source 
man: describe precedence of drop-in .conf files over unit files
This commit is contained in:
Daniel Mack 2016-01-22 09:10:13 +01:00
commit 07313a1826
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
man/systemd.unit.xml
View File

@ -191,6 +191,17 @@
<literal>.d/</literal> subdirectory and reads its
<literal>.conf</literal> files.</para>
<para>In addition to <filename>/etc/systemd/system</filename>,
the drop-in <literal>.conf</literal> files for system services
can be placed in <filename>/usr/lib/systemd/system</filename> or
<filename>/run/systemd/system</filename> directories. Drop-in
files in <filename>/etc</filename> take precedence over those in
<filename>/run</filename> which in turn take precedence over
those in <filename>/usr/lib</filename>. Drop-in files under any of
these directories take precedence over unit files wherever located.
(Of course, since <filename>/run</filename> is temporary and
<filename>/usr/lib</filename> is for vendors, it is unlikely
drop-ins should be used in either of those places.)</para>
<!-- Note that we do not document .include here, as we
consider it mostly obsolete, and want people to
use .d/ drop-ins instead. -->
@ -1402,6 +1413,7 @@ PrivateTmp=yes</programlisting>
cannot be reset to an empty list, so dependencies can only be
added in drop-ins. If you want to remove dependencies, you have
to override the entire unit.</para>
</example>
</refsect1>