X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsysctl.d.xml;h=00a857b11a3cd4ca30140db9f61cff8a4d943a2a;hb=085afe36cb823e7d5b8c5f3ef21ebb9639bac78b;hp=0ef5545163bd49c3ec16ebd2482b101df7ebd00b;hpb=fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda;p=elogind.git
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 0ef554516..00a857b11 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -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,30 @@
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 later 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.
+
+ The settings configured with
+ sysctl.d files will be applied
+ early on boot. The network interface-specific options
+ will also be applied individually for each network
+ interface as it shows up in the system. (More
+ specifically, that is
+ net.ipv4.conf.*,
+ net.ipv6.conf.*,
+ net.ipv4.neigh.* and net.ipv6.neigh.*)