From a6da9336af579703887e12cffe6a42ce55827756 Mon Sep 17 00:00:00 2001 From: Stefan Baumgartner Date: Fri, 24 May 2024 08:15:50 +0200 Subject: [PATCH] Update tests_networking More elegant regex to accommodate for tabs and spaces. --- include/tests_networking | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_networking b/include/tests_networking index 24bfc7d1..764204cf 100644 --- a/include/tests_networking +++ b/include/tests_networking @@ -750,7 +750,7 @@ UNCOMMON_PROTOCOL_DISABLED=0 # First check modprobe.conf if [ -f ${ROOTDIR}etc/modprobe.conf ]; then - DATA=$(${GREPBINARY} "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf) + DATA=$(${GREPBINARY} -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf) if [ -n "${DATA}" ]; then LogText "Result: found ${P} module disabled via modprobe.conf" UNCOMMON_PROTOCOL_DISABLED=1 @@ -759,7 +759,7 @@ # Then additional modprobe configuration files if [ -d ${ROOTDIR}etc/modprobe.d ]; then # Return file names (-l) and suppress errors (-s) - DATA=$(${GREPBINARY} -l -s "^install +${P} +/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*) + DATA=$(${GREPBINARY} -l -s -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*) if [ -n "${DATA}" ]; then UNCOMMON_PROTOCOL_DISABLED=1 for F in ${DATA}; do