diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-03-03 19:10:21 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-03-03 19:10:21 -0500 |
| commit | e93549ef29c4123d9ee45acb5815048390201e49 (patch) | |
| tree | 2cfe31cef554e2b7a3dd9b5a27f4d5867901c7f0 /src | |
| parent | 3b33b542733f68123efb46dbb7c3903235302e1f (diff) | |
Do not advertise .d snippets over main config file
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootchart/bootchart.conf | 7 | ||||
| -rw-r--r-- | src/core/system.conf | 7 | ||||
| -rw-r--r-- | src/journal/coredump.conf | 7 | ||||
| -rw-r--r-- | src/journal/journald.conf | 7 | ||||
| -rw-r--r-- | src/login/logind.conf | 7 | ||||
| -rw-r--r-- | src/resolve/resolved.conf.in | 5 | ||||
| -rw-r--r-- | src/timesync/timesyncd.conf.in | 7 |
7 files changed, 27 insertions, 20 deletions
diff --git a/src/bootchart/bootchart.conf b/src/bootchart/bootchart.conf index 2d7cb61217..4f5e50936e 100644 --- a/src/bootchart/bootchart.conf +++ b/src/bootchart/bootchart.conf @@ -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 diff --git a/src/core/system.conf b/src/core/system.conf index a3727200df..231609033b 100644 --- a/src/core/system.conf +++ b/src/core/system.conf @@ -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 diff --git a/src/journal/coredump.conf b/src/journal/coredump.conf index 0fe9fe801a..c2f0643e03 100644 --- a/src/journal/coredump.conf +++ b/src/journal/coredump.conf @@ -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 diff --git a/src/journal/journald.conf b/src/journal/journald.conf index 29bdf8f183..47eefe91c1 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -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 diff --git a/src/login/logind.conf b/src/login/logind.conf index 6b1943a2d1..834c4c2ebf 100644 --- a/src/login/logind.conf +++ b/src/login/logind.conf @@ -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 diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in index e5a19ee474..3eb19e42b7 100644 --- a/src/resolve/resolved.conf.in +++ b/src/resolve/resolved.conf.in @@ -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 diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in index fc3c6c49cf..b6a2ada273 100644 --- a/src/timesync/timesyncd.conf.in +++ b/src/timesync/timesyncd.conf.in @@ -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= |