X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=69e96ee9e580aaf963602aa2fccd84beb56323f6;hb=3e2f69b779aa0f3466ebb45837e8507baa0832f7;hp=8f336dc0dd6461696430e58a2ebd436c15c4319a;hpb=c91faef3b3facfdf13282aee957af25dd555890b;p=elogind.git
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 8f336dc0d..69e96ee9e 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -7,16 +7,16 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -47,30 +47,60 @@
/etc/sysctl.d/*.conf
+ /run/sysctl.d/*.conf
+ /usr/lib/sysctl.d/*.conf
Description
- systemd uses
- /etc/sysctl.d/ to configure
- sysctl8
- kernel parameters to load during boot. Each
- configuration file is named in the style of
- /etc/sysctl.d/<program>.conf.
+ At boot,
+ systemd-sysctl.service8
+ reads configuration files from the above directories
+ to configure
+ sysctl8
+ kernel parameters.
- Configuration Format
-
- 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.
-
- Note that both / and . are accepted as
- separators in sysctl variable names.
-
+ 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.
+
+ Note that both / and . are accepted as label
+ separators within sysctl variable
+ names. kernel.domainname=foo and
+ kernel/domainname=foo hence are
+ entirely equivalent.
+
+ Each configuration file shall be named in the
+ 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
+ name in /usr/lib/. Packages
+ should install their configuration files in
+ /usr/lib/. Files in
+ /etc/ are reserved for the local
+ 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.
+
+ If the administrator wants to disable a
+ configuration file supplied by the vendor, the
+ recommended way is to place a symlink to
+ /dev/null in
+ /etc/sysctl.d/ bearing the
+ same filename.
@@ -87,6 +117,8 @@ kernel.domainname=example.com
See Also
systemd1,
+ systemd-sysctl.service8,
+ systemd-delta1,
sysctl8,
sysctl.conf5