From d586ff7001abc1a881fe47b5d8ff7c75374f382f Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 12 Feb 2021 13:26:12 +0100
Subject: [PATCH] fix: shellcheck for modules.d/90lvm/lvm_scan.sh

---
 modules.d/90lvm/lvm_scan.sh | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index ff8e66e2..a7540a5c 100755
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -2,7 +2,7 @@
 
 # run lvm scan if udev has settled
 
-extraargs="$@"
+extraargs="$*"
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 VGS=$(getargs rd.lvm.vg -d rd_LVM_VG=)
@@ -10,6 +10,7 @@ LVS=$(getargs rd.lvm.lv -d rd_LVM_LV=)
 SNAPSHOT=$(getargs rd.lvm.snapshot -d rd_LVM_SNAPSHOT=)
 SNAPSIZE=$(getargs rd.lvm.snapsize -d rd_LVM_SNAPSIZE=)
 
+# shellcheck disable=SC2174
 [ -d /etc/lvm ] || mkdir -m 0755 -p /etc/lvm
 # build a list of devices to scan
 lvmdevs=$(
@@ -24,13 +25,13 @@ if [ ! -e /etc/lvm/lvm.conf ]; then
         echo 'devices {';
         printf '    filter = [ '
         for dev in $lvmdevs; do
-            printf '"a|^/dev/%s$|", ' $dev;
+            printf '"a|^/dev/%s$|", ' "$dev";
         done;
         echo '"r/.*/" ]';
         echo '}';
 
         # establish LVM locking
-        if [ -n $SNAPSHOT ]; then
+        if [ -n "$SNAPSHOT" ]; then
             echo 'global {';
             echo '    locking_type = 1';
             echo '    use_lvmetad = 0';
@@ -50,11 +51,11 @@ check_lvm_ver() {
     min=$2
     ver=$3
     # --poll is supported since 2.2.57
-    [ $4 -lt $maj ] && return 1
-    [ $4 -gt $maj ] && return 0
-    [ $5 -lt $min ] && return 1
-    [ $5 -gt $min ] && return 0
-    [ $6 -ge $ver ] && return 0
+    [ "$4" -lt "$maj" ] && return 1
+    [ "$4" -gt "$maj" ] && return 0
+    [ "$5" -lt "$min" ] && return 1
+    [ "$5" -gt "$min" ] && return 0
+    [ "$6" -ge "$ver" ] && return 0
     return 1
 }
 
@@ -62,7 +63,8 @@ check_lvm_ver() {
 #   LVM version:     2.02.53(1) (2009-09-25)
 OLDIFS=$IFS
 IFS=.
-set $(lvm version 2>/dev/null)
+# shellcheck disable=SC2046
+set -- $(lvm version 2>/dev/null)
 IFS=$OLDIFS
 maj=${1##*:}
 min=$2
@@ -72,14 +74,14 @@ sub=${sub%%\(*};
 lvm_ignorelockingfailure="--ignorelockingfailure"
 lvm_quirk_args="--ignorelockingfailure --ignoremonitoring"
 
-check_lvm_ver 2 2 57 $maj $min $sub && \
+check_lvm_ver 2 2 57 "$maj" "$min" "$sub" && \
     lvm_quirk_args="$lvm_quirk_args --poll n"
 
-if check_lvm_ver 2 2 65 $maj $min $sub; then
+if check_lvm_ver 2 2 65 "$maj" "$min" "$sub"; then
     lvm_quirk_args=" --sysinit $extraargs"
 fi
 
-if check_lvm_ver 2 2 221 $maj $min $sub; then
+if check_lvm_ver 2 2 221 "$maj" "$min" "$sub"; then
     lvm_quirk_args=" $extraargs"
     unset lvm_ignorelockingfailure
 fi
@@ -98,27 +100,27 @@ if [ -n "$SNAPSHOT" ] ; then
     SNAP_LV=${SNAPSHOT##*:}
 
     info "Removing existing LVM snapshot $SNAP_LV"
-    lvm lvremove --force $SNAP_LV 2>&1| vinfo
+    lvm lvremove --force "$SNAP_LV" 2>&1| vinfo
 
     # Determine snapshot size
     if [ -z "$SNAPSIZE" ] ; then
-        SNAPSIZE=$(lvm lvs --noheadings  --units m --options lv_size $ORIG_LV)
+        SNAPSIZE=$(lvm lvs --noheadings  --units m --options lv_size "$ORIG_LV")
         info "No LVM snapshot size provided, using size of $ORIG_LV ($SNAPSIZE)"
     fi
 
     info "Creating LVM snapshot $SNAP_LV ($SNAPSIZE)"
-    lvm lvcreate -s -n $SNAP_LV -L $SNAPSIZE $ORIG_LV 2>&1| vinfo
+    lvm lvcreate -s -n "$SNAP_LV" -L "$SNAPSIZE" "$ORIG_LV" 2>&1| vinfo
 fi
 
 if [ -n "$LVS" ] ; then
     info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
     lvm lvscan $lvm_ignorelockingfailure 2>&1 | vinfo
     for LV in $LVS; do
-        lvm lvchange --yes -K -ay $lvm_quirk_args $LV 2>&1 | vinfo
+        lvm lvchange --yes -K -ay $lvm_quirk_args "$LV" 2>&1 | vinfo
     done
 fi
 
-if [ -z "$LVS" -o -n "$VGS" ]; then
+if [ -z "$LVS" ] || [ -n "$VGS" ]; then
     info "Scanning devices $lvmdevs for LVM volume groups $VGS"
     lvm vgscan $lvm_ignorelockingfailure 2>&1 | vinfo
     lvm vgchange -ay $lvm_quirk_args $VGS 2>&1 | vinfo