From 150e2248c8475235dfa6549750662efbce8eeceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Wed, 21 Apr 2021 21:09:29 +0000 Subject: [PATCH] fix: point to the correct drop-ins subdirectory for confs (cherry picked from commit eb34cce1787259de4cea1430fa017b6bd25bc4c1) (cherry picked from commit 3d896e8b03b39c5bd68ef026536acb7496ae995f) --- src/core/user.conf.in | 2 +- src/coredump/coredump.conf | 2 +- src/home/homed.conf | 2 +- src/journal-remote/journal-remote.conf.in | 2 +- src/journal-remote/journal-upload.conf.in | 2 +- src/journal/journald.conf | 2 +- src/login/logind.conf.in | 2 +- src/network/networkd.conf | 2 +- src/oom/oomd.conf | 2 +- src/pstore/pstore.conf | 2 +- src/resolve/resolved.conf.in | 2 +- src/sleep/sleep.conf | 2 +- src/timesync/timesyncd.conf.in | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/core/user.conf.in b/src/core/user.conf.in index d3887e1c87..5f0ca4cb02 100644 --- a/src/core/user.conf.in +++ b/src/core/user.conf.in @@ -7,7 +7,7 @@ # # 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. +# the user.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. diff --git a/src/coredump/coredump.conf b/src/coredump/coredump.conf index 56c1008245..1f75d48d33 100644 --- a/src/coredump/coredump.conf +++ b/src/coredump/coredump.conf @@ -7,7 +7,7 @@ # # 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. +# the coredump.conf.d/ subdirectory. The latter is generally recommended. # Defaults can be restored by simply deleting this file and all drop-ins. # # Use 'systemd-analyze cat-config systemd/coredump.conf' to display the full config. diff --git a/src/home/homed.conf b/src/home/homed.conf index ba854641df..d3a685e816 100644 --- a/src/home/homed.conf +++ b/src/home/homed.conf @@ -7,7 +7,7 @@ # # 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. +# the homed.conf.d/ subdirectory. The latter is generally recommended. # Defaults can be restored by simply deleting this file and all drop-ins. # # Use 'systemd-analyze cat-config systemd/homed.conf' to display the full config. diff --git a/src/journal-remote/journal-remote.conf.in b/src/journal-remote/journal-remote.conf.in index 1e4c3b9710..4c1b78ebc1 100644 --- a/src/journal-remote/journal-remote.conf.in +++ b/src/journal-remote/journal-remote.conf.in @@ -7,7 +7,7 @@ # # 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. +# the journal-remote.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. diff --git a/src/journal-remote/journal-upload.conf.in b/src/journal-remote/journal-upload.conf.in index 7d2bdc7501..29b623bdfa 100644 --- a/src/journal-remote/journal-upload.conf.in +++ b/src/journal-remote/journal-upload.conf.in @@ -7,7 +7,7 @@ # # 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. +# the journal-upload.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. diff --git a/src/journal/journald.conf b/src/journal/journald.conf index 18d6b30773..5a60a9d39c 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -7,7 +7,7 @@ # # 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. +# the journald.conf.d/ subdirectory. The latter is generally recommended. # Defaults can be restored by simply deleting this file and all drop-ins. # # Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config. diff --git a/src/login/logind.conf.in b/src/login/logind.conf.in index 76f529c176..564868e7ae 100644 --- a/src/login/logind.conf.in +++ b/src/login/logind.conf.in @@ -7,7 +7,7 @@ # # 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. +# the logind.conf.d/ subdirectory. The latter is generally recommended. # Defaults can be restored by simply deleting this file and all drop-ins. # # Use 'systemd-analyze cat-config systemd/logind.conf' to display the full config. diff --git a/src/network/networkd.conf b/src/network/networkd.conf index 0eac327314..1e8ccc3642 100644 --- a/src/network/networkd.conf +++ b/src/network/networkd.conf @@ -7,7 +7,7 @@ # # 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. +# the networkd.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. diff --git a/src/oom/oomd.conf b/src/oom/oomd.conf index 332165e933..ce4e946e8d 100644 --- a/src/oom/oomd.conf +++ b/src/oom/oomd.conf @@ -7,7 +7,7 @@ # # 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. +# the oomd.conf.d/ subdirectory. The latter is generally recommended. # Defaults can be restored by simply deleting this file and all drop-ins. # # Use 'systemd-analyze cat-config systemd/oomd.conf' to display the full config. diff --git a/src/pstore/pstore.conf b/src/pstore/pstore.conf index 7b7b1e8493..68fb04ae0a 100644 --- a/src/pstore/pstore.conf +++ b/src/pstore/pstore.conf @@ -7,7 +7,7 @@ # # 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. +# the pstore.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 8eb587c947..791cf92045 100644 --- a/src/resolve/resolved.conf.in +++ b/src/resolve/resolved.conf.in @@ -7,7 +7,7 @@ # # 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. +# the resolved.conf.d/ subdirectory. The latter is generally recommended. # Defaults can be restored by simply deleting this file and all drop-ins. # # Use 'systemd-analyze cat-config systemd/resolved.conf' to display the full config. diff --git a/src/sleep/sleep.conf b/src/sleep/sleep.conf index 7c04072d42..174f5ea3e8 100644 --- a/src/sleep/sleep.conf +++ b/src/sleep/sleep.conf @@ -7,7 +7,7 @@ # # 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. +# the sleep.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. diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in index 8a9a14cf0c..8a2c33e17c 100644 --- a/src/timesync/timesyncd.conf.in +++ b/src/timesync/timesyncd.conf.in @@ -7,7 +7,7 @@ # # 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. +# the timesyncd.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.