diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:05:43 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:31 -0500 |
| commit | d3fae78fe86f1dfcdb07fd613ccbb3adf547a617 (patch) | |
| tree | 5d69302bf78d904cc5c8e90d21ae76be175ca10d /man/sysctl.d.xml | |
| parent | 02b75c9edd61f47de7940b61b97b071b69f38a11 (diff) | |
man: Factor out a common snippet for .d directories and precedence
Several manpages contain duplicate text describing a standard set of .d
configuration directories, with the usual sorting, precedence,
overrides, and so on. Factor this common text out using XInclude before
proliferating it even further.
Diffstat (limited to 'man/sysctl.d.xml')
| -rw-r--r-- | man/sysctl.d.xml | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 922b5c4eaa..c67a199fb5 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -18,7 +18,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="sysctl.d"> +<refentry id="sysctl.d" + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>sysctl.d</title> @@ -70,27 +71,6 @@ is <literal>#</literal> or <literal>;</literal> are ignored.</para> - <para>Each configuration file shall be named in the - style of <filename><replaceable>program</replaceable>.conf</filename>. - Files in <filename>/etc/</filename> override files - with the same name in <filename>/usr/lib/</filename> - and <filename>/run/</filename>. Files in - <filename>/run/</filename> override files with the same - name in <filename>/usr/lib/</filename>. Packages - should install their configuration files in - <filename>/usr/lib/</filename>. Files in - <filename>/etc/</filename> are reserved for the local - administrator, who may use this logic to override the - configuration files installed by vendor packages. All - configuration files are sorted by their filename in - lexicographic order, regardless of which of the - directories they reside in. If multiple files specify the - same variable name, the entry in the file with the - lexicographically latest name will be applied. It is - recommended to prefix all filenames with a two-digit - number and a dash, to simplify the ordering of the - files.</para> - <para>Note that either <literal>/</literal> or <literal>.</literal> may be used as separators within sysctl variable names. If the first separator is a @@ -109,13 +89,6 @@ <filename>/proc/sys/net/ipv4/conf/enp3s0.200/forwarding</filename>. </para> - <para>If the administrator wants to disable a - configuration file supplied by the vendor, the - recommended way is to place a symlink to - <filename>/dev/null</filename> in - <filename>/etc/sysctl.d/</filename> bearing the - same filename.</para> - <para>The settings configured with <filename>sysctl.d</filename> files will be applied early on boot. The network interface-specific options @@ -142,6 +115,8 @@ example below).</para> </refsect1> + <xi:include href="standard-conf.xml" xpointer="confd" /> + <refsect1> <title>Examples</title> <example> |