shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-27 13:57:26 +03:00
Code

man: describe masking of .network files better

Browse Source 
This should clear up some confusion in
https://github.com/systemd/systemd/issues/717.

This basically copies the description from systemd.unit to this
man page. Masking can happen also in /run, so strike the part
about /etc, and also add the magic work "mask".
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-07-25 13:03:44 -04:00
parent 3460810e8c
commit 57e27ec0ad
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/systemd.link.xml
View File

@ -68,11 +68,10 @@
in <filename>/etc</filename> have the highest priority, files in
<filename>/run</filename> take precedence over files with the same
name in <filename>/usr/lib</filename>. This can be used to
override a system-supplied link file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a
link file in <filename>/usr/lib</filename>, pointing to
<filename>/dev/null</filename>, disables the link file
entirely.</para>
override a system-supplied link file with a local file if needed.
As a special case, an empty file (file size 0) or symlink with the
same name pointing to <filename>/dev/null</filename>, disable the
configuration file entirely (it is "masked").</para>
<para>The link file contains a <literal>[Match]</literal> section,
which determines if a given link file may be applied to a given

8
man/systemd.netdev.xml
View File

@ -80,11 +80,9 @@
<filename>/run</filename> take precedence over files with the same
name in <filename>/usr/lib</filename>. This can be used to
override a system-supplied configuration file with a local file if
needed; a symlink in <filename>/etc</filename> with the same name
as a configuration file in <filename>/usr/lib</filename>, pointing
to <filename>/dev/null</filename>, disables the configuration file
entirely.</para>
needed. As a special case, an empty file (file size 0) or symlink
with the same name pointing to <filename>/dev/null</filename>,
disable the configuration file entirely (it is "masked").</para>
</refsect1>
<refsect1>

8
man/systemd.network.xml
View File

@ -76,11 +76,9 @@
<filename>/run</filename> take precedence over files with the same
name in <filename>/usr/lib</filename>. This can be used to
override a system-supplied configuration file with a local file if
needed; a symlink in <filename>/etc</filename> with the same name
as a configuration file in <filename>/usr/lib</filename>, pointing
to <filename>/dev/null</filename>, disables the configuration file
entirely.</para>
needed. As a special case, an empty file (file size 0) or symlink
with the same name pointing to <filename>/dev/null</filename>,
disable the configuration file entirely (it is "masked").</para>
</refsect1>
<refsect1>