diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-07-25 23:25:30 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-07-25 23:25:30 +0200 |
| commit | 57cafd9bc08f9d925438eec22ff603950cabf325 (patch) | |
| tree | aa3c5ed0375b926501b758df0be0a0178738cc45 | |
| parent | 3460810e8c61986a4605ad80c9e4805eb95cb5a1 (diff) | |
| parent | 57e27ec0ada6775d85a5201cd25e989d92d0a1af (diff) | |
| download | systemd-57cafd9bc08f9d925438eec22ff603950cabf325.tar.gz systemd-57cafd9bc08f9d925438eec22ff603950cabf325.tar.bz2 systemd-57cafd9bc08f9d925438eec22ff603950cabf325.zip | |
Merge pull request #725 from keszybz/network-file-masking
man: describe masking of .network files better
| -rw-r--r-- | man/systemd.link.xml | 9 | ||||
| -rw-r--r-- | man/systemd.netdev.xml | 8 | ||||
| -rw-r--r-- | man/systemd.network.xml | 8 |
3 files changed, 10 insertions, 15 deletions
diff --git a/man/systemd.link.xml b/man/systemd.link.xml index d9b1879c59..b630ef7a17 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -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 diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 7e92d1d99c..3ef1420758 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -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> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index fbb0bef5c2..5be1102894 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -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> |