From 95729721ccb29a3b98fa38d7fe0817f71f868f5d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 26 Mar 2021 10:29:11 +0100
Subject: [PATCH] fix(watchdog-modules): shellcheck for
 modules.d/04watchdog-modules

---
 modules.d/04watchdog-modules/.shchkdir       |  0
 modules.d/04watchdog-modules/module-setup.sh | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 modules.d/04watchdog-modules/.shchkdir

diff --git a/modules.d/04watchdog-modules/.shchkdir b/modules.d/04watchdog-modules/.shchkdir
new file mode 100644
index 00000000..e69de29b
diff --git a/modules.d/04watchdog-modules/module-setup.sh b/modules.d/04watchdog-modules/module-setup.sh
index 705592fa..2a94e346 100755
--- a/modules.d/04watchdog-modules/module-setup.sh
+++ b/modules.d/04watchdog-modules/module-setup.sh
@@ -17,13 +17,13 @@ install() {
 
 installkernel() {
     local -A _drivers
-    local _alldrivers _wdtdrv _wdtppath _dir
+    local _wdtdrv
 
     for _wd in /sys/class/watchdog/*; do
-        ! [ -e $_wd ] && continue
-        _wdtdrv=$(get_dev_module $_wd)
+        ! [ -e "$_wd" ] && continue
+        _wdtdrv=$(get_dev_module "$_wd")
         if [[ $_wdtdrv ]]; then
-            instmods $_wdtdrv
+            instmods "$_wdtdrv"
             for i in $_wdtdrv; do
                 _drivers[$i]=1
             done
@@ -31,8 +31,11 @@ installkernel() {
     done
 
     # ensure that watchdog module is loaded as early as possible
-    _alldrivers="${!_drivers[*]}"
-    [[ $_alldrivers ]] && echo "rd.driver.pre=${_alldrivers// /,}" > ${initdir}/etc/cmdline.d/00-watchdog.conf
-
+    if [[ ${!_drivers[*]} ]]; then
+        echo "rd.driver.pre=\"$(
+            IFS=,
+            echo "${!_drivers[*]}"
+        )\"" > "${initdir}"/etc/cmdline.d/00-watchdog.conf
+    fi
     return 0
 }