X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=5544283d49a229e5245ea04f17972e958b5be0d3;hb=a42c8b54b1619078c02f5e439bd2564c6d0f901f;hp=a4a495ee32b4a473efa30f5d7ccdd3a9e07a7f61;hpb=9393a8774c1acd60deea40007061b9ffc783bf7e;p=elogind.git
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index a4a495ee3..5544283d4 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,11 +77,11 @@
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
- /run override files with the same
+ /run/ override files with the same
name in /usr/lib/. Packages
should install their configuration files in
/usr/lib/. 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 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.
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.