From: keentux <valentin.lefebvre@suse.com>
Date: Wed, 23 Nov 2022 16:39:08 +0000 (+0000)
Subject: refactor(zfcp_rules): use read -r instead of cat
X-Git-Tag: 058~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a9b165de0ee0184dffb02c9223ff41aa0aeb903;p=thirdparty%2Fdracut.git

refactor(zfcp_rules): use read -r instead of cat

Fixes #1268: Bad style `var=$(cat <file>)`. Replace by `read -r var < file`

Signed-off-by: keentux <valentin.lefebvre@suse.com>
---

diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh
index 3fa354792..dfa795146 100755
--- a/modules.d/95zfcp_rules/module-setup.sh
+++ b/modules.d/95zfcp_rules/module-setup.sh
@@ -12,25 +12,25 @@ cmdline() {
         local _sdev _scsiid _hostno _lun _wwpn _ccw _port_type
         local _allow_lun_scan _is_npiv
 
-        _allow_lun_scan=$(cat /sys/module/zfcp/parameters/allow_lun_scan)
+        read -r _allow_lun_scan < /sys/module/zfcp/parameters/allow_lun_scan
         [ "${_devpath#*/sd}" == "$_devpath" ] && return 1
         _sdev="${_devpath%%/block/*}"
         [ -e "${_sdev}"/fcp_lun ] || return 1
         _scsiid="${_sdev##*/}"
         _hostno="${_scsiid%%:*}"
         [ -d /sys/class/fc_host/host"${_hostno}" ] || return 1
-        _port_type=$(cat /sys/class/fc_host/host"${_hostno}"/port_type)
+        read -r _port_type < /sys/class/fc_host/host"${_hostno}"/port_type
         case "$_port_type" in
             NPIV*)
                 _is_npiv=1
                 ;;
         esac
-        _ccw=$(cat "${_sdev}"/hba_id)
+        read -r _ccw < "${_sdev}"/hba_id
         if [ "$_is_npiv" ] && [ "$_allow_lun_scan" = "Y" ]; then
             echo "rd.zfcp=${_ccw}"
         else
-            _lun=$(cat "${_sdev}"/fcp_lun)
-            _wwpn=$(cat "${_sdev}"/wwpn)
+            read -r _lun < "${_sdev}"/fcp_lun
+            read -r _wwpn < "${_sdev}"/wwpn
             echo "rd.zfcp=${_ccw},${_wwpn},${_lun}"
         fi
         return 0
diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh
index d217c45c4..669eaf291 100755
--- a/modules.d/95zfcp_rules/parse-zfcp.sh
+++ b/modules.d/95zfcp_rules/parse-zfcp.sh
@@ -34,9 +34,9 @@ EOF
 if [[ -f /sys/firmware/ipl/ipl_type && \
     $(< /sys/firmware/ipl/ipl_type) == "fcp" ]]; then
     (
-        _wwpn=$(cat /sys/firmware/ipl/wwpn)
-        _lun=$(cat /sys/firmware/ipl/lun)
-        _ccw=$(cat /sys/firmware/ipl/device)
+        read -r _wwpn < /sys/firmware/ipl/wwpn
+        read -r _lun < /sys/firmware/ipl/lun
+        read -r _ccw < /sys/firmware/ipl/device
 
         create_udev_rule "$_ccw" "$_wwpn" "$_lun"
     )