From 3a04fdff87b5684bfa6c4bdd2a047fc12748c7ce Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Fri, 26 Mar 2021 10:29:27 +0100
Subject: [PATCH] fix(fstab-sys): shellcheck for modules.d/95fstab-sys

---
 modules.d/95fstab-sys/.shchkdir    |  0
 modules.d/95fstab-sys/mount-sys.sh | 16 ++++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 modules.d/95fstab-sys/.shchkdir

diff --git a/modules.d/95fstab-sys/.shchkdir b/modules.d/95fstab-sys/.shchkdir
new file mode 100644
index 00000000..e69de29b
diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
index 0ae10166..bb4bcdb3 100755
--- a/modules.d/95fstab-sys/mount-sys.sh
+++ b/modules.d/95fstab-sys/mount-sys.sh
@@ -4,24 +4,24 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 type det_fs > /dev/null 2>&1 || . /lib/fs-lib.sh
 
 fstab_mount() {
-    local _dev _mp _fs _opts _dump _pass _rest
+    local _dev _mp _fs _opts _pass
     test -e "$1" || return 1
     info "Mounting from $1"
-    while read _dev _mp _fs _opts _dump _pass _rest || [ -n "$_dev" ]; do
+    while read -r _dev _mp _fs _opts _ _pass _ || [ -n "$_dev" ]; do
         [ -z "${_dev%%#*}" ] && continue # Skip comment lines
-        ismounted $_mp && continue       # Skip mounted filesystem
+        ismounted "$_mp" && continue     # Skip mounted filesystem
         if [ "$_pass" -gt 0 ] && ! strstr "$_opts" _netdev; then
             fsck_single "$_dev" "$_fs" "$_opts"
         fi
         _fs=$(det_fs "$_dev" "$_fs")
         info "Mounting $_dev"
         if [ -d "$NEWROOT/$_mp" ]; then
-            mount -v -t $_fs -o $_opts $_dev "$NEWROOT/$_mp" 2>&1 | vinfo
+            mount -v -t "$_fs" -o "$_opts" "$_dev" "$NEWROOT/$_mp" 2>&1 | vinfo
         else
             [ -d "$_mp" ] || mkdir -p "$_mp"
-            mount -v -t $_fs -o $_opts $_dev $_mp 2>&1 | vinfo
+            mount -v -t "$_fs" -o "$_opts" "$_dev" "$_mp" 2>&1 | vinfo
         fi
-    done < $1
+    done < "$1"
     return 0
 }
 
@@ -32,8 +32,8 @@ if [ -z "$DRACUT_SYSTEMD" ]; then
 fi
 
 # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
-if [ -f $NEWROOT/etc/fstab.sys ]; then
-    fstab_mount $NEWROOT/etc/fstab.sys
+if [ -f "$NEWROOT"/etc/fstab.sys ]; then
+    fstab_mount "$NEWROOT"/etc/fstab.sys
 elif [ -f /etc/fstab.sys ]; then
     fstab_mount /etc/fstab.sys
 fi