From: Harald Hoyer <harald@redhat.com>
Date: Wed, 31 Mar 2021 09:15:46 +0000 (+0200)
Subject: fix(nbd): shellcheck regression
X-Git-Tag: 054~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d83bce21bfc874b29c1fb99e8fabb843f038725;p=thirdparty%2Fdracut.git

fix(nbd): shellcheck regression

`$opts`, `$preopts` and `$nbdport` shouldn't have been quoted as they
can expand to multiple options.

Fixes: https://github.com/dracutdevs/dracut/issues/1270
---

diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh
index 6fca50eb6..b485c081f 100755
--- a/modules.d/95nbd/nbdroot.sh
+++ b/modules.d/95nbd/nbdroot.sh
@@ -129,8 +129,10 @@ else
     nbdport="-name $nbdport"
 fi
 
-nbd-client -check /dev/nbd0 > /dev/null \
-    || nbd-client "$nbdserver" "$nbdport" /dev/nbd0 "$preopts" "$opts" || exit 1
+if ! nbd-client -check /dev/nbd0 > /dev/null; then
+    # shellcheck disable=SC2086
+    nbd-client "$nbdserver" $nbdport /dev/nbd0 $preopts $opts || exit 1
+fi
 
 # NBD doesn't emit uevents when it gets connected, so kick it
 echo change > /sys/block/nbd0/uevent