mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-24 21:34:08 +03:00
Merge pull request #2409 from snakeroot/dropin-doc-2
man: describe precedence of drop-in .conf files over unit files
This commit is contained in:
commit
07313a1826
@ -191,6 +191,17 @@
|
|||||||
<literal>.d/</literal> subdirectory and reads its
|
<literal>.d/</literal> subdirectory and reads its
|
||||||
<literal>.conf</literal> files.</para>
|
<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
|
<!-- Note that we do not document .include here, as we
|
||||||
consider it mostly obsolete, and want people to
|
consider it mostly obsolete, and want people to
|
||||||
use .d/ drop-ins instead. -->
|
use .d/ drop-ins instead. -->
|
||||||
@ -1402,6 +1413,7 @@ PrivateTmp=yes</programlisting>
|
|||||||
cannot be reset to an empty list, so dependencies can only be
|
cannot be reset to an empty list, so dependencies can only be
|
||||||
added in drop-ins. If you want to remove dependencies, you have
|
added in drop-ins. If you want to remove dependencies, you have
|
||||||
to override the entire unit.</para>
|
to override the entire unit.</para>
|
||||||
|
|
||||||
</example>
|
</example>
|
||||||
</refsect1>
|
</refsect1>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user