summaryrefslogtreecommitdiff
path: root/man/sysctl.d.xml
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-04-25 20:41:47 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-04-25 20:41:47 +0200
commitdb1413d7380acacc4e50faf801ca0d401da89764 (patch)
tree5525908e3b419149c0458348210fedf37eafc703 /man/sysctl.d.xml
parent3a90ae048233021833ae828c1fc6bf0eeab46197 (diff)
sysctl.d, binfmt.d, modules-load.d: switch to stacked config dirs in /lib, /etc, /run
Diffstat (limited to 'man/sysctl.d.xml')
-rw-r--r--man/sysctl.d.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 8f336dc0dd..51afbfa77a 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -46,7 +46,9 @@
</refnamediv>
<refsynopsisdiv>
+ <para><filename>/usr/lib/sysctl.d/*.conf</filename></para>
<para><filename>/etc/sysctl.d/*.conf</filename></para>
+ <para><filename>/run/sysctl.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1>
@@ -71,6 +73,19 @@
<para>Note that both / and . are accepted as
separators in sysctl variable names.</para>
+ <para>Files in <filename>/etc/</filename> overwrite
+ files with the same name in <filename>/usr/lib/</filename>.
+ Files in <filename>/run</filename> overwrite files with
+ the same name in <filename>/etc/</filename> and
+ <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
+ administration, which possibly decides to overwrite the
+ configurations installed from packages. All files are sorted
+ by filename in alphabetical order, regardless in which of the
+ directories they reside, to ensure that a specific
+ configuration file takes precedence over another file with
+ an alphabetically later name.</para>
</refsect1>
<refsect1>