X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=854864cffcb86c695b70c1904a63775f587830f3;hb=2cfbd749af308bdbe56edcfed7f3eea0fc2b93d2;hp=048d23f4ce916329ac32cb82775d71f0936730ae;hpb=6110885c2c4b7c576ac5819af5416ec54200d8e3;p=elogind.git
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 048d23f4c..854864cff 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -54,21 +54,21 @@
Description
- At boot,
- systemd-binfmt.service8
- reads configuration files from the above directories
- to configure
- sysctl8
- kernel parameters.
+ At boot,
+ systemd-sysctl.service8
+ reads configuration files from the above directories
+ to configure
+ sysctl8
+ kernel parameters.
- Configuration Format
+ Configuration Format
- 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.
+ 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.
Note that both / and . are accepted as label
separators within sysctl variable
@@ -77,7 +77,7 @@
entirely equivalent.
Each configuration file shall be named in the
- style of <program>.conf.
+ style of program.conf.
Files in /etc/ override files
with the same name in /usr/lib/
and /run/. Files in
@@ -89,18 +89,20 @@
administrator, who may use this logic to override the
configuration files installed by vendor packages. All
configuration files are sorted by their filename 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.
+ lexicographic order, regardless in which of the
+ directories they reside. 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.
If the administrator wants to disable a
- configuration file supplied by the vendor the
+ configuration file supplied by the vendor, the
recommended way is to place a symlink to
/dev/null in
/etc/sysctl.d/ bearing the
- same file name.
+ same filename.