From: Lucas De Marchi <lucas.demarchi@intel.com>
To: linux-modules@vger.kernel.org
Cc: Jan Tojnar <jtojnar@gmail.com>
Subject: [PATCH 1/3] libkmod: Fix documentation on config precedence order
Date: Tue, 19 Jan 2021 06:52:36 -0800 [thread overview]
Message-ID: <20210119145238.12774-1-lucas.demarchi@intel.com> (raw)
/etc is has higher priority than /run.
---
libkmod/libkmod.c | 2 +-
man/depmod.d.xml | 2 +-
man/modprobe.d.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 43423d6..25655b9 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -235,7 +235,7 @@ static char *get_kernel_release(const char *dirname)
* @config_paths: ordered array of paths (directories or files) where
* to load from user-defined configuration parameters such as
* alias, blacklists, commands (install, remove). If
- * NULL defaults to /run/modprobe.d, /etc/modprobe.d and
+ * NULL defaults to /etc/modprobe.d, /run/modprobe.d and
* /lib/modprobe.d. Give an empty vector if configuration should
* not be read. This array must be null terminated.
*
diff --git a/man/depmod.d.xml b/man/depmod.d.xml
index 4341a56..6472bda 100644
--- a/man/depmod.d.xml
+++ b/man/depmod.d.xml
@@ -40,8 +40,8 @@
<refsynopsisdiv>
<para><filename>/usr/lib/depmod.d/*.conf</filename></para>
- <para><filename>/etc/depmod.d/*.conf</filename></para>
<para><filename>/run/depmod.d/*.conf</filename></para>
+ <para><filename>/etc/depmod.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1><title>DESCRIPTION</title>
diff --git a/man/modprobe.d.xml b/man/modprobe.d.xml
index 211af84..a674d69 100644
--- a/man/modprobe.d.xml
+++ b/man/modprobe.d.xml
@@ -41,8 +41,8 @@
<refsynopsisdiv>
<para><filename>/lib/modprobe.d/*.conf</filename></para>
- <para><filename>/etc/modprobe.d/*.conf</filename></para>
<para><filename>/run/modprobe.d/*.conf</filename></para>
+ <para><filename>/etc/modprobe.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1><title>DESCRIPTION</title>
--
2.30.0
next reply other threads:[~2021-01-19 18:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 14:52 Lucas De Marchi [this message]
2021-01-19 14:52 ` [PATCH 2/3] depmod: fix precedence order Lucas De Marchi
2021-01-19 15:34 ` Marco d'Itri
2021-01-19 17:22 ` Lucas De Marchi
2021-01-19 18:31 ` Dmitry V. Levin
2021-01-19 20:36 ` Lucas De Marchi
2021-01-19 14:52 ` [PATCH 3/3] Support /usr/local for configuration files 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=20210119145238.12774-1-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=jtojnar@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).