summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Lewandowski <k.lewandowsk@samsung.com>2021-07-08 12:35:38 +0200
committerSeung-Woo Kim <sw0312.kim@samsung.com>2023-11-07 18:26:32 +0900
commit542995743d96f71f55828962ac588f80833a2538 (patch)
tree212edc13f38da083648cdad159712612665eef49
parentcd49886a8e5869e2aa500183b59b7e614ce132b6 (diff)
downloadkmod-542995743d96f71f55828962ac588f80833a2538.tar.gz
kmod-542995743d96f71f55828962ac588f80833a2538.tar.bz2
kmod-542995743d96f71f55828962ac588f80833a2538.zip
This commit adds additional tizen-specific /lib/modules/modprobe.d to kmod search path to allow for packages providing modules to also provide its configuration. In Tizen kernel and modules images are build separately from "platform" image, meaning only limited paths can be used (/lib/modules, /hal) for its files to be accessible from the system. Change-Id: I6985339abd1234aecfb5802484bd57f36a64bab2 Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
-rw-r--r--libkmod/libkmod.c1
-rw-r--r--man/modprobe.d.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 1b8773c..70834ed 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -66,6 +66,7 @@ static const char *const default_config_paths[] = {
"/run/modprobe.d",
"/usr/local/lib/modprobe.d",
"/lib/modprobe.d",
+ "/lib/modules/modprobe.d",
NULL
};
diff --git a/man/modprobe.d.xml b/man/modprobe.d.xml
index 0ab3e91..b5d4ca3 100644
--- a/man/modprobe.d.xml
+++ b/man/modprobe.d.xml
@@ -44,6 +44,7 @@
<para><filename>/usr/local/lib/modprobe.d/*.conf</filename></para>
<para><filename>/run/modprobe.d/*.conf</filename></para>
<para><filename>/etc/modprobe.d/*.conf</filename></para>
+ <para><filename>/lib/modules/modprobe.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1><title>DESCRIPTION</title>