From: Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@kernel.org>
To: linux-modules@vger.kernel.org
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Subject: [PATCH kmod v2 07/17] man: depmod.d: document the config file order handling
Date: Mon, 08 Jul 2024 14:43:15 +0100 [thread overview]
Message-ID: <20240708-man-v2-7-a23df6ef871e@gmail.com> (raw)
In-Reply-To: <20240708-man-v2-0-a23df6ef871e@gmail.com>
From: Emil Velikov <emil.l.velikov@gmail.com>
The depmod.d configuration order/handling aligns with existing tools
such as sysctl.d, even though there is no mention in the manual.
Reorder the list in SYNOPSIS and add a bit of verbiage describing things.
Section is inspired by sysctl.d(5) and sysctl(8).
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
v2: Reword as per Lucas' suggestion.
---
man/Makefile.am | 1 +
man/depmod.d.5.scd | 20 ++++++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/man/Makefile.am b/man/Makefile.am
index 39a0015..6356d87 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -15,6 +15,7 @@ CLEANFILES = $(filter-out $(MAN_STUB), $(dist_man_MANS))
define generate_manpage
$(AM_V_SCDOC)cat $< | \
+ sed -e 's|@SYSCONFDIR@|$(sysconfdir)|g' | \
sed -e 's|@DISTCONFDIR@|$(distconfdir)|g' | \
sed -e 's|@MODULE_DIRECTORY@|$(module_directory)|g' | \
$(SCDOC) > $@
diff --git a/man/depmod.d.5.scd b/man/depmod.d.5.scd
index 9cf99d5..bd1291b 100644
--- a/man/depmod.d.5.scd
+++ b/man/depmod.d.5.scd
@@ -6,15 +6,15 @@ depmod.d - Configuration directory for depmod
# SYNOPSIS
-/lib/depmod.d/\*.conf
+@SYSCONFDIR@/depmod.d/\*.conf
-@DISTCONFDIR@/depmod.d/\*.conf
+/run/depmod.d/\*.conf
/usr/local/lib/depmod.d/\*.conf
-/run/depmod.d/\*.conf
+@DISTCONFDIR@/depmod.d/\*.conf
-/etc/depmod.d/\*.conf
+/lib/depmod.d/\*.conf
# DESCRIPTION
@@ -29,6 +29,18 @@ lines and lines starting with '#' ignored (useful for adding comments). A '\\'
at the end of a line causes it to continue on the next line, which makes the
files a bit neater.
+# CONFIGURATION DIRECTORIES AND PRECEDENCE
+
+Configuration files are read from directories in listed in SYNOPSYS in that
+order of precedence. Once a file of a given filename is loaded, any file of the
+same name in subsequent directories is ignored.
+
+All configuration files are sorted in lexicographic order, regardless of the
+directory they reside in. Configuration files can either be completely replaced
+(by having a new configuration file with the same name in a directory of higher
+priority) or partially replaced (by having a configuration file that is ordered
+later).
+
# COMMANDS
search _subdirectory..._
--
2.45.2
next prev parent reply other threads:[~2024-07-08 13:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-08 13:43 [PATCH kmod v2 00/17] man: minor improvements, post the scdoc conversion Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 01/17] man: add some extra bold/italic annotations Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 02/17] man: white space fixes Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 03/17] man: misc punctuation fixes Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 04/17] man: some options take an argument, mention that Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 05/17] man: couple of grammar/language fixes Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 06/17] man: stop removing DISTCONFDIR lines Emil Velikov via B4 Relay
2024-07-08 13:43 ` Emil Velikov via B4 Relay [this message]
2024-07-08 13:43 ` [PATCH kmod v2 08/17] man: depmod.d: factor out a CONFIGURATION FORMAT section Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 09/17] man: depmod.d: rework the opening description sentence Emil Velikov via B4 Relay
2024-07-09 5:01 ` Lucas De Marchi
2024-07-08 13:43 ` [PATCH kmod v2 10/17] man: depmod: remove hard-coded /etc/depmod.d references Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 11/17] man: modprobe.d: document the config file order handling Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 12/17] man: modprobe.d: factor out a CONFIGURATION FORMAT section Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 13/17] man: add few mentions about MODPROBE_OPTIONS Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 14/17] man: modprobe: remove hard-coded /etc/modprobe.d references Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 15/17] man: remove the "Maintained by" references Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 16/17] man: rework AUTHORS section Emil Velikov via B4 Relay
2024-07-08 13:43 ` [PATCH kmod v2 17/17] man: list options one per line Emil Velikov via B4 Relay
2024-07-09 5:20 ` [PATCH kmod v2 00/17] man: minor improvements, post the scdoc conversion Lucas De Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240708-man-v2-7-a23df6ef871e@gmail.com \
--to=devnull+emil.l.velikov.gmail.com@kernel.org \
--cc=emil.l.velikov@gmail.com \
--cc=linux-modules@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).