X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=240aa8113798e5a8cec96b2490abb5384fe23ff7;hb=4c12626c8e3491570b395d68380543e10c98ad33;hp=8f336dc0dd6461696430e58a2ebd436c15c4319a;hpb=c91faef3b3facfdf13282aee957af25dd555890b;p=elogind.git
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 8f336dc0d..240aa8113 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -46,18 +46,18 @@
+ /usr/lib/sysctl.d/*.conf
/etc/sysctl.d/*.conf
+ /run/sysctl.d/*.conf
Description
- systemd uses
- /etc/sysctl.d/ to configure
+ systemd uses configuration files
+ from the above directories to configure
sysctl8
- kernel parameters to load during boot. Each
- configuration file is named in the style of
- /etc/sysctl.d/<program>.conf.
+ kernel parameters to load during boot.
@@ -71,6 +71,21 @@
Note that both / and . are accepted as
separators in sysctl variable names.
+ Each configuration file is named in the style of
+ <program>.conf.
+ Files in /etc/ overwrite
+ files with the same name in /usr/lib/.
+ Files in /run overwrite files with
+ the same name in /etc/ and
+ /usr/lib/. Packages should install their
+ configuration files in /usr/lib/, files
+ in /etc/ 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.