summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-17 19:35:56 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-17 19:35:56 +0000
commit2b328c9fd366f968bba80316a000cbe491032264 (patch)
tree25c646049fc8ac835dcc85db3ae1161281caca46
parentd3e3505b28bffec66cc52d0b1a233278d9023970 (diff)
downloadldetect-2b328c9fd366f968bba80316a000cbe491032264.tar
ldetect-2b328c9fd366f968bba80316a000cbe491032264.tar.gz
ldetect-2b328c9fd366f968bba80316a000cbe491032264.tar.bz2
ldetect-2b328c9fd366f968bba80316a000cbe491032264.tar.xz
ldetect-2b328c9fd366f968bba80316a000cbe491032264.zip
(modalias_resolve_module) do not ignore /etc/modprobe.d/*
-rw-r--r--NEWS2
-rw-r--r--modalias.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index f710940..520d8ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- do not ignore /etc/modprobe.d/*
+
Version 0.12.0 - 13 January 2012, Thierry Vignaud
- switch from libmodprobe to new libkmod
diff --git a/modalias.c b/modalias.c
index 73c71d6..a5b12e2 100644
--- a/modalias.c
+++ b/modalias.c
@@ -65,6 +65,9 @@ char *modalias_resolve_module(const char *modalias) {
/* We only use canned aliases as last resort. */
dkms_file = table_name_to_file("dkms-modules.alias");
const char *alias_filelist[] = {
+ "/run/modprobe.d",
+ "/etc/modprobe.d",
+ "/lib/modprobe.d",
"/lib/module-init-tools/ldetect-lst-modules.alias",
aliasdefault,
dkms_file,