diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-25 21:38:21 +0200 |
---|---|---|
committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-25 21:38:21 +0200 |
commit | 772f83719e3c2262d948a4c4e70fe9babc4c4610 (patch) | |
tree | 973ea77bd6d44c6a96518b8bf9c0ee9aa43159fe /man/sysctl.d.xml | |
parent | db1413d7380acacc4e50faf801ca0d401da89764 (diff) | |
download | systemd-772f83719e3c2262d948a4c4e70fe9babc4c4610.tar.gz |
tmpfiles.d: switch to stacked config dirs in /lib, /etc, /run
Diffstat (limited to 'man/sysctl.d.xml')
-rw-r--r-- | man/sysctl.d.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 51afbfa77a..240aa81137 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -54,12 +54,10 @@ <refsect1> <title>Description</title> - <para><command>systemd</command> uses - <filename>/etc/sysctl.d/</filename> to configure + <para><command>systemd</command> uses configuration files + from the above directories to configure <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry> - kernel parameters to load during boot. Each - configuration file is named in the style of - <filename>/etc/sysctl.d/<program>.conf</filename>.</para> + kernel parameters to load during boot.</para> </refsect1> <refsect1> @@ -73,7 +71,9 @@ <para>Note that both / and . are accepted as separators in sysctl variable names.</para> - <para>Files in <filename>/etc/</filename> overwrite + <para>Each configuration file is named in the style of + <filename><program>.conf</filename>. + Files in <filename>/etc/</filename> overwrite files with the same name in <filename>/usr/lib/</filename>. Files in <filename>/run</filename> overwrite files with the same name in <filename>/etc/</filename> and |