X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=69aac8cab7a1530e371a2310d7da8176d853b125;hb=7a529f63e60dfdccc23d61808c20ba40d9901e47;hp=20f2e24820e53e2d38225a5e5593c526a1a12dc4;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d;p=elogind.git
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 20f2e2482..69aac8cab 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 .
-->
@@ -54,19 +54,21 @@
Description
- systemd uses configuration
- files from the above directories to configure
- sysctl8
- kernel parameters during boot.
+ 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
@@ -76,17 +78,17 @@
Each configuration file shall be named in the
style of <program>.conf.
- Files in /run/ override files
- with the same name in /usr/lib/.
- Files in /etc override files with
- the same name in /run/ and
- /usr/lib/. Packages should
- install their configuration files in
+ 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 installed by vendor packages. All
- configuration files are sorted by their name in
+ 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
@@ -97,8 +99,8 @@
configuration file supplied by the vendor the
recommended way is to place a symlink to
/dev/null in
- /etc/sysctl.d carrying with the
- same name.
+ /etc/sysctl.d/ bearing the
+ same file name.
@@ -115,6 +117,8 @@ kernel.domainname=example.com
See Also
systemd1,
+ systemd-sysctl.service8,
+ systemd-delta1,
sysctl8,
sysctl.conf5