Recommend drop-ins over modifications to the main config file

As discussed in https://github.com/systemd/systemd/pull/18347.

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index edb7887b4fa75fc4289f9ab63d39b060176d418c..f02b9b0594e5b269c5d340eaeb7136675f871f6d 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -44,8 +44,9 @@
     <para>The default configuration is set during compilation, so configuration is only needed when it is
     necessary to deviate from those defaults. Initially, the main configuration file in
     <filename>/etc/systemd/</filename> contains commented out entries showing the defaults as a guide to the
-    administrator. Local overrides can be created by editing this file or by creating drop-ins, see below.
-    </para>
+    administrator. Local overrides can be created by editing this file or by creating drop-ins, as described
+    below. Using drop-ins for local configuration is recommended over modifications to the main configuration
+    file.</para>
 
     <para>In addition to the "main" configuration file, drop-in configuration snippets are read from
     <filename>/usr/lib/systemd/*.conf.d/</filename>, <filename>/usr/local/lib/systemd/*.conf.d/</filename>,

diff --git a/src/core/system.conf.in b/src/core/system.conf.in
index 40bb548887110bb967038e5546661fc725be2071..eecaff9f276066098b696cd5012b55c5fb77f28a 100644 (file)
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@@ -1,13 +1,14 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See systemd-system.conf(5) for details.
 

diff --git a/src/core/user.conf.in b/src/core/user.conf.in
index bbe06319c9acfd73d77e5a0e317848c1ec405baf..d3887e1c876be4ff0b1f886a8a9fd2b7849f1fb6 100644 (file)
--- a/src/core/user.conf.in
+++ b/src/core/user.conf.in
@@ -1,14 +1,16 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# You can override the directives in this file by creating files in
-# /etc/systemd/user.conf.d/*.conf.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
-# See systemd-user.conf(5) for details
+# See systemd-user.conf(5) for details.
 
 [Manager]
 #LogLevel=info

diff --git a/src/coredump/coredump.conf b/src/coredump/coredump.conf
index c2f0643e03935d477ec635f25310f1a2b06e7172..738c45bed25af9a7200eda60acf394755ee85394 100644 (file)
--- a/src/coredump/coredump.conf
+++ b/src/coredump/coredump.conf
@@ -1,13 +1,14 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See coredump.conf(5) for details.
 

diff --git a/src/home/homed.conf b/src/home/homed.conf
index 1b5dbedabd5c3f9458c2fbd9e8f052c33fc54063..86b6266895ca6a5836424f8fc54e4061c2c1168d 100644 (file)
--- a/src/home/homed.conf
+++ b/src/home/homed.conf
@@ -1,15 +1,16 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
-# See homed.conf(5) for details
+# See homed.conf(5) for details.
 
 [Home]
 #DefaultStorage=

diff --git a/src/journal-remote/journal-remote.conf.in b/src/journal-remote/journal-remote.conf.in
index edc3abab4b0bdb3b93ffdee6dada54b3278dc4b4..1e4c3b9710fe0027e0c09cb0ec51edb1acf109a9 100644 (file)
--- a/src/journal-remote/journal-remote.conf.in
+++ b/src/journal-remote/journal-remote.conf.in
@@ -1,15 +1,16 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
-# See journal-remote.conf(5) for details
+# See journal-remote.conf(5) for details.
 
 [Remote]
 # Seal=false

diff --git a/src/journal-remote/journal-upload.conf.in b/src/journal-remote/journal-upload.conf.in
index 5f59a6fe804d7cd2e9e98b6b339c41f67a15c143..7d2bdc75018f2bf4da84827e0bbabd81e2e98652 100644 (file)
--- a/src/journal-remote/journal-upload.conf.in
+++ b/src/journal-remote/journal-upload.conf.in
@@ -1,15 +1,16 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
-# See journal-upload.conf(5) for details
+# See journal-upload.conf(5) for details.
 
 [Upload]
 # URL=

diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index 2e1aacd8c55bbc543c253511ce3283edf91f9f25..ee674ebefed4bb93b25f46d5e121129b1b825a2e 100644 (file)
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -1,13 +1,14 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See journald.conf(5) for details.
 

diff --git a/src/login/logind.conf.in b/src/login/logind.conf.in
index 8b220267f3a1fa900b8e0aabd930030d27e1c99d..800c452a60f6de606ed17bef14f084a28b0f071f 100644 (file)
--- a/src/login/logind.conf.in
+++ b/src/login/logind.conf.in
@@ -1,13 +1,14 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See logind.conf(5) for details.
 

diff --git a/src/network/networkd.conf b/src/network/networkd.conf
index 5339e5e5eda659275e9765cbdc93a182c0f00f3c..4850ba61f2fa1de18be759d48e491efd2d3a04f8 100644 (file)
--- a/src/network/networkd.conf
+++ b/src/network/networkd.conf
@@ -1,15 +1,16 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
-# See networkd.conf(5) for details
+# See networkd.conf(5) for details.
 
 [Network]
 #SpeedMeter=no

diff --git a/src/oom/oomd.conf b/src/oom/oomd.conf
index bd6a9391c6e87fc213adf2b6b81593395a3fd94a..59e3416bf35b0723c8d0b28021aa0a8f083daceb 100644 (file)
--- a/src/oom/oomd.conf
+++ b/src/oom/oomd.conf
@@ -1,13 +1,14 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See oomd.conf(5) for details
 

diff --git a/src/pstore/pstore.conf b/src/pstore/pstore.conf
index 93a8b6707cc2d8d3aa062c7e45a94d2c645fd454..7b7b1e84932f78abb21ca29ece55b7e2a7cd8188 100644 (file)
--- a/src/pstore/pstore.conf
+++ b/src/pstore/pstore.conf
@@ -1,13 +1,14 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See pstore.conf(5) for details.
 

diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
index e1d06c0fb19067290b4fbbc3fb2a7e41bf76d72a..33187618e5c6c1ab426fc957921805592bed995e 100644 (file)
--- a/src/resolve/resolved.conf.in
+++ b/src/resolve/resolved.conf.in
@@ -1,15 +1,16 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
-# See resolved.conf(5) for details
+# See resolved.conf(5) for details.
 
 [Resolve]
 # Some examples of DNS servers which may be used for DNS= and FallbackDNS=:

diff --git a/src/sleep/sleep.conf b/src/sleep/sleep.conf
index dc2ed37f70805adaf2dfbfc4b926aabfd4a28409..7c04072d42d2f8f66db968fa153f973b6e767f8d 100644 (file)
--- a/src/sleep/sleep.conf
+++ b/src/sleep/sleep.conf
@@ -1,15 +1,16 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
-# See systemd-sleep.conf(5) for details
+# See systemd-sleep.conf(5) for details.
 
 [Sleep]
 #AllowSuspend=yes

diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in
index f91c034a01327e3a102f7f8d50a1057bad33d9a8..8a9a14cf0c7d6941bcc11e58e3d5161fdb2e6c44 100644 (file)
--- a/src/timesync/timesyncd.conf.in
+++ b/src/timesync/timesyncd.conf.in
@@ -1,13 +1,14 @@
 #  This file is part of systemd.
 #
-#  systemd is free software; you can redistribute it and/or modify it
-#  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 free software; you can redistribute it and/or modify it 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.
 #
-# 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.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
 #
 # See timesyncd.conf(5) for details.