summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-03-21 23:32:02 +0100
committerLennart Poettering <lennart@poettering.net>2012-03-21 23:32:02 +0100
commit95f77929d8d94480015cd7383a5504cf9ebf2fa5 (patch)
treeb818835bc08cc77eeb734b81a2952d0bda08b0f8 /man
parentde19ece73860e90a10029fbc4c4f6d3b296f1a1e (diff)
man: updates to sysctl.d(5)
Diffstat (limited to 'man')
-rw-r--r--man/sysctl.d.xml65
1 files changed, 39 insertions, 26 deletions
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 9c108b0b7c..20f2e24820 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -54,38 +54,51 @@
<refsect1>
<title>Description</title>
- <para><command>systemd</command> uses configuration files
- from the above directories to configure
+ <para><command>systemd</command> uses configuration
+ files from the above directories to configure
<citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- kernel parameters to load during boot.</para>
+ kernel parameters during boot.</para>
</refsect1>
<refsect1>
<title>Configuration Format</title>
- <para>The configuration files should simply contain a
- list of variable assignments, separated by
- newlines. Empty lines and lines whose first
- non-whitespace character is # or ; are ignored.</para>
-
- <para>Note that both / and . are accepted as
- separators in sysctl variable names.</para>
-
- <para>Each configuration file is named in the style of
- <filename>&lt;program&gt;.conf</filename>.
- 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>
+ <para>The configuration files contain a list of
+ variable assignments, separated by newlines. Empty
+ lines and lines whose first non-whitespace character
+ is # or ; are ignored.</para>
+
+ <para>Note that both / and . are accepted as label
+ separators within sysctl variable
+ names. <literal>kernel.domainname=foo</literal> and
+ <literal>kernel/domainname=foo</literal> hence are
+ entirely equivalent.</para>
+
+ <para>Each configuration file shall be named in the
+ style of <filename>&lt;program&gt;.conf</filename>.
+ Files in <filename>/run/</filename> override files
+ with the same name in <filename>/usr/lib/</filename>.
+ Files in <filename>/etc</filename> override files with
+ the same name in <filename>/run/</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
+ administrator, who may use this logic to override the
+ configuration installed by vendor packages. All
+ configuration files are sorted by their name in
+ alphabetical order, regardless in which of the
+ directories they reside, to guarantee that a specific
+ configuration file takes precedence over another file
+ with an alphabetically earlier name, if both files
+ contain the same variable setting.</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> carrying with the
+ same name.</para>
</refsect1>
<refsect1>