From b98f5c2429d27bb19c63ac21f4d409af44ccb149 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Thu, 28 Nov 2019 06:33:49 -0500 Subject: [PATCH] scripts/setup.sh: Fix. Variable virtio_names used as array contains empty first element. It fixes change 474989. "for blkname in $blknames; do" was changed to "for blkname in "${blknames[@]}"; do" if blknames=" vda" then first blkname="" and linux_bind_driver is called for vda although it has active mountpoint Change-Id: I16d4379db274faa5703230072cfcf8d18a8ef5e6 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476061 Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- scripts/setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index cdf00ed40..fed8c75b2 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -159,15 +159,15 @@ function get_nvme_name_from_bdf { function get_virtio_names_from_bdf { blk_devs=$(lsblk --nodeps --output NAME) - virtio_names='' + virtio_names=() for dev in $blk_devs; do if readlink "/sys/block/$dev" | grep -q "$1"; then - virtio_names="$virtio_names $dev" + virtio_names+=("$dev") fi done - eval "$2='$virtio_names'" + eval "$2=( " "${virtio_names[@]}" " )" } function configure_linux_pci {