From 57e27ec0ada6775d85a5201cd25e989d92d0a1af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 25 Jul 2015 13:03:44 -0400 Subject: [PATCH] man: describe masking of .network files better 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". --- man/systemd.link.xml | 9 ++++----- man/systemd.netdev.xml | 8 +++----- 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 d9b1879..b630ef7 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -68,11 +68,10 @@ in /etc have the highest priority, files in /run take precedence over files with the same name in /usr/lib. This can be used to - override a system-supplied link file with a local file if needed; - a symlink in /etc with the same name as a - link file in /usr/lib, pointing to - /dev/null, disables the link file - entirely. + 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 /dev/null, disable the + configuration file entirely (it is "masked"). The link file contains a [Match] 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 7e92d1d..3ef1420 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -80,11 +80,9 @@ /run take precedence over files with the same name in /usr/lib. This can be used to override a system-supplied configuration file with a local file if - needed; a symlink in /etc with the same name - as a configuration file in /usr/lib, pointing - to /dev/null, disables the configuration file - entirely. - + needed. As a special case, an empty file (file size 0) or symlink + with the same name pointing to /dev/null, + disable the configuration file entirely (it is "masked"). diff --git a/man/systemd.network.xml b/man/systemd.network.xml index fbb0bef..5be1102 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -76,11 +76,9 @@ /run take precedence over files with the same name in /usr/lib. This can be used to override a system-supplied configuration file with a local file if - needed; a symlink in /etc with the same name - as a configuration file in /usr/lib, pointing - to /dev/null, disables the configuration file - entirely. - + needed. As a special case, an empty file (file size 0) or symlink + with the same name pointing to /dev/null, + disable the configuration file entirely (it is "masked"). -- 2.7.4