From 13a8d2a190fcc9331552fbb804e6f202e1f2a36d Mon Sep 17 00:00:00 2001
From: Johannes Segitz <jsegitz@suse.de>
Date: Wed, 13 Oct 2021 16:31:09 +0200
Subject: [PATCH] tests_filesystems: check for blacklisted modules also under
 /usr/lib/modules.d

---
 include/tests_filesystems | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/tests_filesystems b/include/tests_filesystems
index ce93b018b..e5c3678fc 100644
--- a/include/tests_filesystems
+++ b/include/tests_filesystems
@@ -836,15 +836,18 @@
                     AddHP 3 3
                     if IsDebug; then Display --indent 6 --text "- Module ${FS} not present in the kernel" --result OK --color GREEN; fi
                 fi
-                FIND=$(${LSBINARY} ${ROOTDIR}etc/modprobe.d/* 2> /dev/null)
-                if [ -n "${FIND}" ]; then
-		                FIND1=$(${EGREPBINARY} "blacklist ${FS}" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
-		                FIND2=$(${EGREPBINARY} "install ${FS} /bin/true" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
-                    if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then
-                        Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN
-                        LogText "Result: module ${FS} is blacklisted"
+                for SUBDIR in "${ROOTDIR}etc" "/usr/lib"; do
+                    FIND=$(${LSBINARY} ${SUBDIR}/modprobe.d/* 2> /dev/null)
+                    if [ -n "${FIND}" ]; then
+                        FIND1=$(${EGREPBINARY} "blacklist ${FS}" ${SUBDIR}/modprobe.d/* | ${GREPBINARY} -v "#")
+                        FIND2=$(${EGREPBINARY} "install ${FS} /bin/true" ${SUBDIR}/modprobe.d/* | ${GREPBINARY} -v "#")
+                        if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then
+                            Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN
+                            LogText "Result: module ${FS} is blacklisted"
+                            break
+                        fi
                     fi
-		            fi
+                done
             done
             if [ ${FOUND} -eq 1 ]; then
                 Display --indent 4 --text "- Discovered kernel modules: ${AVAILABLE_MODPROBE_FS}"