tests_filesystems: check for blacklisted modules also under

/usr/lib/modules.d
This commit is contained in:
Johannes Segitz 2021-10-13 16:31:09 +02:00
parent 798c1054d7
commit 13a8d2a190

View File

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