shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Do not advertise .d snippets over main config file

Browse Source 
For daemons which have a main configuration file, there's
little reason for the administrator to use configuration snippets.
They are useful for packagers which need to override settings, but
we shouldn't advertise that as the main way of configuring those
services.

https://bugs.freedesktop.org/show_bug.cgi?id=89397
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-03 19:10:21 -05:00
parent 3b33b54273
commit e93549ef29
16 changed files with 72 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/bootchart.conf.xml
View File

@ -68,8 +68,7 @@
parameters and graph output.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

3
man/coredump.conf.xml
View File

@ -63,8 +63,7 @@
a handler for core dumps invoked by the kernel.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

3
man/journald.conf.xml
View File

@ -64,8 +64,7 @@
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

8
man/logind.conf.xml
View File

@ -58,11 +58,13 @@
<refsect1>
<title>Description</title>
<para>These files configure various parameters of the systemd login manager, <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
<para>These files configure various parameters of the systemd
login manager,
<citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

3
man/resolved.conf.xml
View File

@ -63,8 +63,7 @@
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

40
man/standard-conf.xml
View File

@ -33,13 +33,39 @@
configuration file.</para>
</refsection>
<refsection id='conf'>
<title>Configuration File</title>
<refsection id='main-conf'>
<title>Configuration Directories and Precedence</title>
<para>Configuration is also read from a single configuration file in
<filename>/etc/</filename>. This file is read before any of the
configuration directories, and has the lowest precedence; entries in a file
in any configuration directory override entries in the single configuration
file.</para>
<para>Default configuration is defined during compilation, so a
configuration file is only needed when it is necessary to deviate
from those defaults. By default the configuration file in
<filename>/etc/systemd/</filename> contains commented out entries
showing the defaults as a guide to the administrator. This file
can be edited to create local overrides.
</para>
<para>When packages need to customize the configuration, they can
install configuration snippets in
<filename>/usr/lib/systemd/*.conf.d/</filename>. Files in
<filename>/etc/</filename> are reserved for the local
administrator, who may use this logic to override the
configuration files installed by vendor packages. The main
configuration file is read before any of the configuration
directories, and has the lowest precedence; entries in a file in
any configuration directory override entries in the single
configuration file. Files in the
<filename>logind.conf.d/</filename> configuration subdirectories
are sorted by their filename in lexicographic order, regardless of
which of the subdirectories they reside in. If multiple files
specify the same option, the entry in the file with the
lexicographically latest name takes precedence. It is recommended
to prefix all filenames in those subdirectories with a two-digit
number and a dash, to simplify the ordering of the files.</para>
<para>To disable a configuration file supplied by the vendor, the
recommended way is to place a symlink to
<filename>/dev/null</filename> in the configuration directory in
<filename>/etc/</filename>, with the same filename as the vendor
configuration file.</para>
</refsection>
</refsection>

3
man/systemd-sleep.conf.xml
View File

@ -112,8 +112,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
attempts to suspend or hibernate the machine.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

3
man/systemd-system.conf.xml
View File

@ -74,8 +74,7 @@
operations.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

3
man/timesyncd.conf.xml
View File

@ -63,8 +63,7 @@
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<xi:include href="standard-conf.xml" xpointer="main-conf" />
<refsect1>
<title>Options</title>

7
src/bootchart/bootchart.conf
View File

@ -5,10 +5,11 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/bootchart.conf.d/*.conf.
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See bootchart.conf(5) for details
# See bootchart.conf(5) for details.
[Bootchart]
#Samples=500

7
src/core/system.conf
View File

@ -5,10 +5,11 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/system.conf.d/*.conf.
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See systemd-system.conf(5) for details
# See systemd-system.conf(5) for details.
[Manager]
#LogLevel=info

7
src/journal/coredump.conf
View File

@ -5,10 +5,11 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/coredump.conf.d/*.conf.
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See coredump.conf(5) for details
# See coredump.conf(5) for details.
[Coredump]
#Storage=external

7
src/journal/journald.conf
View File

@ -5,10 +5,11 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/journald.conf.d/*.conf.
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See journald.conf(5) for details
# See journald.conf(5) for details.
[Journal]
#Storage=auto

7
src/login/logind.conf
View File

@ -5,10 +5,11 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/logind.conf.d/*.conf.
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See logind.conf(5) for details
# See logind.conf(5) for details.
[Login]
#NAutoVTs=6

5
src/resolve/resolved.conf.in
View File

@ -5,8 +5,9 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/resolved.conf.d/*.conf.
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See resolved.conf(5) for details

7
src/timesync/timesyncd.conf.in
View File

@ -5,10 +5,11 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# You can override the directives in this file by creating files in
# /etc/systemd/timesyncd.conf.d/*.conf.
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See timesyncd.conf(5) for details
# See timesyncd.conf(5) for details.
[Time]
#NTP=