From 102746245e0ceb2f6c34b2fec7c53a9ddf54e7aa Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 15 Dec 2017 11:54:25 -0700 Subject: [PATCH] test/nvme.sh: add support for older kernel versions the sysfs for NVMe drives on some older versions of the linux kernel differs slightly from the latest kernel versions. This patch adds a fallback to support those older kernel versions. Change-Id: I2787e0d15d310ce1f264b0a303f53e48525a9a1d Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/391983 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- test/lib/nvme/nvme.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh index 9c9d74f7e..d2d85ee2d 100755 --- a/test/lib/nvme/nvme.sh +++ b/test/lib/nvme/nvme.sh @@ -17,7 +17,11 @@ function get_nvme_name_from_bdf { fi nvme_devs=`lsblk -d --output NAME | grep "^nvme"` for dev in $nvme_devs; do - bdf=$(basename $(readlink /sys/block/$dev/device/device)) + link_name=$(readlink /sys/block/$dev/device/device) || true + if [ -z "$link_name" ]; then + link_name=$(readlink /sys/block/$dev/device) + fi + bdf=$(basename "$link_name") if [ "$bdf" = "$1" ]; then eval "$2=$dev" return