[PATCH 4/5] kdump-lib.sh: Use a more generic helper to detect omitted dracut module

[Kairui Song]

Signed-off-by: Kairui Song <kasong(a)redhat.com&gt;
---
 kdump-lib.sh | 35 ++++++++++++++---------------------
 kdumpctl     |  2 +-
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/kdump-lib.sh b/kdump-lib.sh
index 119b7e2..ca69ce4 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -453,28 +453,21 @@ get_ifcfg_filename() {
     echo -n "${ifcfg_file}"
 }
 
-# returns 0 when omission of watchdog module is desired in dracut_args
+# returns 0 when omission of a module is desired in dracut_args
 # returns 1 otherwise
-is_wdt_mod_omitted() {
-	local dracut_args
-	local ret=1
-
-	dracut_args=$(grep  "^dracut_args" /etc/kdump.conf)
-	[[ -z $dracut_args ]] && return $ret
-
-	eval set -- $dracut_args
-	while :; do
-		[[ -z $1 ]] && break
-		case $1 in
-			-o|--omit)
-				echo $2 | grep -qw "watchdog"
-				[[ $? == 0 ]] && ret=0
-				break
-		esac
-		shift
-	done
-
-	return $ret
+is_dracut_mod_omitted() {
+    local dracut_args dracut_mod=$1
+
+    set -- $(grep  "^dracut_args" /etc/kdump.conf)
+    while [ $# -gt 0 ]; do
+        case $1 in
+            -o|--omit)
+                [[ " ${2//[^[:alnum:]]/ } " ==  *" $dracut_mod "* ]]
&& return 0
+        esac
+        shift
+    done
+
+    return 1
 }
 
 is_wdt_active() {
diff --git a/kdumpctl b/kdumpctl
index 3d8f711..2f7e7e3 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -462,7 +462,7 @@ check_drivers_modified()
 			fi
 		done
 	}
-	is_wdt_mod_omitted || _record_wd_drivers
+	is_dracut_mod_omitted watchdog || _record_wd_drivers
 
 	[ -z "$_new_drivers" ] && return 0
 
-- 
2.28.0