From e5032e1835fe08f3fb093d705da74c30409538b6 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Wed, 8 Feb 2023 07:53:03 +0100
Subject: [PATCH] board/common: minor shellcheck fixes to mnt script

 - Double quoting to prevent word splitting
 - local keyword is undefined in POSIX sh
 - `-m 0755` only applies to deepest directory (ignore)
 - Useless cat
 - Redirect to null, lilke the other mount_rw statements

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 board/common/rootfs/lib/infix/mnt | 32 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/board/common/rootfs/lib/infix/mnt b/board/common/rootfs/lib/infix/mnt
index 95cf2f1f..a254bb92 100755
--- a/board/common/rootfs/lib/infix/mnt
+++ b/board/common/rootfs/lib/infix/mnt
@@ -24,27 +24,29 @@ opt="-k"
 mount_rw()
 {
     # If something is already setup, leave it be.
-    mountpoint -q /$1 && return 0
+    mountpoint -q "/$1" && return 0
 
     # TODO: Also look for UBI partitions
-    mount LABEL=$1 && return 0
+    mount LABEL="$1" && return 0
 
     return 1
 }
 
+# mkdir -p -m 0755 only applies to the deepest directory
+# shellcheck disable=SC2174
 mount_overlay()
 {
-    local tag=$1
-    local src=$2
-    local dst=$3
-    local u=$src/infix/$tag.u
-    local w=$src/infix/$tag.w
+    tag="$1"
+    src="$2"
+    dst="$3"
+    u="$src/infix/$tag.u"
+    w="$src/infix/$tag.w"
 
-    mkdir -p -m 0755 $u
-    mkdir -p -m 0755 $w
+    mkdir -p -m 0755 "$u"
+    mkdir -p -m 0755 "$w"
 
-    mount -t overlay $tag-overlay $dst \
-	  -o lowerdir=$dst,upperdir=$u,workdir=$w
+    mount -t overlay "$tag-overlay" "$dst" \
+	  -o lowerdir="$dst",upperdir="$u",workdir="$w"
 }
 
 use_etc()
@@ -52,7 +54,7 @@ use_etc()
     # Finit's condition system is not yet bootstrapped when /etc/fstab
     # is parsed, so we have to manually check for the boot/etc
     # condition.
-    cat /proc/1/cmdline | awk '
+    awk '
 	$0 == "finit.cond" {
 		cond=1;
 		next;
@@ -60,7 +62,7 @@ use_etc()
 	cond == 1 {
 		exit(index($0, "etc") == 0);
 	}
-    '
+    ' /proc/1/cmdline
 }
 
 # Fall back to console logging if sysklogd is too old
@@ -78,7 +80,7 @@ fi
 
 cfgsrc=/mnt/cfg
 etcsrc=/mnt/tmp
-if ! mount_rw cfg; then
+if ! mount_rw cfg >/dev/null 2>&1; then
     err=1
 
     logger $opt -p user.crit -t "$nm" \
@@ -113,6 +115,6 @@ mount_overlay home $cfgsrc /home
 mount_overlay root $cfgsrc /root
 mount_overlay var  $varsrc /var
 
-[ "$vlibsrc" ] && mount_overlay vlib $vlibsrc /var/lib
+[ "$vlibsrc" ] && mount_overlay vlib "$vlibsrc" /var/lib
 
 exit $err