fix(zipl): shellcheck for modules.d/91zipl

diff --git a/modules.d/91zipl/.shchkdir b/modules.d/91zipl/.shchkdir
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modules.d/91zipl/install_zipl_cmdline.sh b/modules.d/91zipl/install_zipl_cmdline.sh
index 487cd16274d70b94cf35e57f86ffaf6a91dd1fca..9332d31431d8884b891e739ee3c8e0c2fc00958b 100755 (executable)
--- a/modules.d/91zipl/install_zipl_cmdline.sh
+++ b/modules.d/91zipl/install_zipl_cmdline.sh
@@ -5,16 +5,15 @@ MNT=/boot/zipl
 
 if [ -z "$DEV" ]; then
     echo "No IPL device given"
-    > /tmp/install.zipl.cmdline-done
+    : > /tmp/install.zipl.cmdline-done
     exit 1
 fi
 
 [ -d ${MNT} ] || mkdir -p ${MNT}
 
-mount -o ro ${DEV} ${MNT}
-if [ "$?" != "0" ]; then
+if ! mount -o ro "${DEV}" ${MNT}; then
     echo "Failed to mount ${MNT}"
-    > /tmp/install.zipl.cmdline-done
+    : > /tmp/install.zipl.cmdline-done
     exit 1
 fi
 
@@ -23,9 +22,9 @@ if [ -f ${MNT}/dracut-cmdline.conf ]; then
 fi
 
 if [ -f ${MNT}/active_devices.txt ]; then
-    while read dev etc; do
+    while read -r dev _ || [[ $dev ]]; do
         [ "$dev" = "#" -o "$dev" = "" ] && continue
-        cio_ignore -r $dev
+        cio_ignore -r "$dev"
     done < ${MNT}/active_devices.txt
 fi
 
@@ -35,6 +34,6 @@ if [ -f /etc/cmdline.d/99zipl.conf ]; then
     systemctl restart dracut-cmdline.service
     systemctl restart systemd-udev-trigger.service
 fi
-> /tmp/install.zipl.cmdline-done
+: > /tmp/install.zipl.cmdline-done
 
 exit 0

diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh
index 90e9aea58f4c75078a23543ab442483829ef5a12..59b8d53122544d83da3bf6d46066dce86694b72b 100755 (executable)
--- a/modules.d/91zipl/module-setup.sh
+++ b/modules.d/91zipl/module-setup.sh
@@ -24,7 +24,7 @@ installkernel() {
 
     _boot_zipl=$(sed -n -e '/^[[:space:]]*#/d' -e 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab)
     if [ -n "$_boot_zipl" ]; then
-        eval $(blkid -s TYPE -o udev ${_boot_zipl})
+        eval "$(blkid -s TYPE -o udev "${_boot_zipl}")"
         if [ -n "$ID_FS_TYPE" ]; then
             case "$ID_FS_TYPE" in
                 ext?)
@@ -53,7 +53,8 @@ install() {
     inst_hook cmdline 91 "$moddir/parse-zipl.sh"
     inst_script "${moddir}/install_zipl_cmdline.sh" /sbin/install_zipl_cmdline.sh
     if [[ $hostonly_cmdline == "yes" ]]; then
-        local _zipl=$(cmdline)
+        local _zipl
+        _zipl=$(cmdline)
 
         [[ $_zipl ]] && printf "%s\n" "$_zipl" > "${initdir}/etc/cmdline.d/91zipl.conf"
     fi

diff --git a/modules.d/91zipl/parse-zipl.sh b/modules.d/91zipl/parse-zipl.sh
index 8963a395e89e053bd01b778435e2a2fe4b54c8d4..d95a1ddc49c8d10547c0b0a3c15c1bb7d49e41e9 100755 (executable)
--- a/modules.d/91zipl/parse-zipl.sh
+++ b/modules.d/91zipl/parse-zipl.sh
@@ -42,8 +42,8 @@ if [ -n "$zipl_arg" ]; then
     if [ "$zipl_env" ]; then
         {
             printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", ENV{SYSTEMD_READY}!="0", RUN+="/sbin/initqueue --settled --onetime --unique --name install_zipl_cmdline /sbin/install_zipl_cmdline.sh %s"\n' \
-                ${zipl_env} ${zipl_val} ${zipl_arg}
-            echo "[ -f /tmp/install.zipl.cmdline-done ]" > $hookdir/initqueue/finished/wait-zipl-conf.sh
+                ${zipl_env} "${zipl_val}" "${zipl_arg}"
+            echo "[ -f /tmp/install.zipl.cmdline-done ]" > "$hookdir"/initqueue/finished/wait-zipl-conf.sh
         } >> /etc/udev/rules.d/99zipl-conf.rules
         cat /etc/udev/rules.d/99zipl-conf.rules
     fi