Merging upstream version 103.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 5 insertions, 4 deletions

diff --git a/modules.d/95fcoe/fcoe-edd.sh b/modules.d/95fcoe/fcoe-edd.sh
index 17f8a7c..ece31ba 100755
--- a/modules.d/95fcoe/fcoe-edd.sh
+++ b/modules.d/95fcoe/fcoe-edd.sh
@@ -34,7 +34,7 @@ for disk in /sys/firmware/edd/int13_*; do
     fi
     for nic in "${disk}"/pci_dev/net/*; do
         [ -d "$nic" ] || continue
-        if [ -n "${dev_port}" -a -e "${nic}/dev_port" ]; then
+        if [ -n "${dev_port}" ] && [ -e "${nic}/dev_port" ]; then
             if [ "$(cat "${nic}"/dev_port)" -ne "${dev_port}" ]; then
                 continue
             fi
diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
index 0828f03..3c6654c 100755
--- a/modules.d/95fcoe/fcoe-up.sh
+++ b/modules.d/95fcoe/fcoe-up.sh
@@ -11,7 +11,7 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 type ip_to_var > /dev/null 2>&1 || . /lib/net-lib.sh
 
 # Huh? Missing arguments ??
-[ -z "$1" -o -z "$2" ] && exit 1
+[ -z "$1" ] || [ -z "$2" ] && exit 1
 
 netif=$1
 dcb=$2
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index 3de85c2..ecebbda 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -2,6 +2,7 @@
 
 # called by dracut
 check() {
+    # shellcheck disable=SC2317  # called later by for_each_host_dev_and_slaves
     is_fcoe() {
         block_is_fcoe "$1" || return 1
     }
diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
index a6f284b..dc4ca32 100755
--- a/modules.d/95fcoe/parse-fcoe.sh
+++ b/modules.d/95fcoe/parse-fcoe.sh
@@ -72,7 +72,7 @@ parse_fcoe_opts() {
             ;;
     esac
 
-    if [ "$fcoe_dcb" != "nodcb" -a "$fcoe_dcb" != "dcb" ]; then
+    if [ "$fcoe_dcb" != "nodcb" ] && [ "$fcoe_dcb" != "dcb" ]; then
         warn "Invalid FCoE DCB option: $fcoe_dcb"
     fi
 
@@ -81,7 +81,7 @@ parse_fcoe_opts() {
         return 0
     fi
 
-    if [ -z "$fcoe_interface" -a -z "$fcoe_mac" ]; then
+    if [ -z "$fcoe_interface" ] && [ -z "$fcoe_mac" ]; then
         warn "fcoe: Neither interface nor MAC specified for fcoe=$fcoe"
         return 1
     fi