From 86af2ae59fe4dbed64299b485c9355a2ea2e6919 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 12 Jul 2017 15:12:24 -0700 Subject: [PATCH] test/bdev: do not hardcode sgdisk directory At least on Ubuntu, sgdisk gets installed to /sbin, not /usr/sbin. Signed-off-by: Jim Harris Change-Id: I59c806d2c93c6a1773aea11d6fc669e3df0e3c08 Reviewed-on: https://review.gerrithub.io/369304 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Daniel Verkamp --- test/lib/bdev/blockdev.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lib/bdev/blockdev.sh b/test/lib/bdev/blockdev.sh index 2d37f5b1b..508b67407 100755 --- a/test/lib/bdev/blockdev.sh +++ b/test/lib/bdev/blockdev.sh @@ -17,7 +17,7 @@ timing_enter bounds $testdir/bdevio/bdevio $testdir/bdev.conf timing_exit bounds -if [ $(uname -s) = Linux ] && [ -f /usr/sbin/sgdisk ]; then +if [ $(uname -s) = Linux ] && hash sgdisk; then echo "[Rpc]" >> $testdir/bdev.conf echo " Enable Yes" >> $testdir/bdev.conf @@ -33,8 +33,8 @@ if [ $(uname -s) = Linux ] && [ -f /usr/sbin/sgdisk ]; then if [ -e /dev/nbd0 ]; then parted -s /dev/nbd0 mklabel gpt mkpart first '0%' '50%' mkpart second '50%' '100%' # change the partition type GUID to SPDK GUID value - /usr/sbin/sgdisk -t 1:$SPDK_GPT_GUID /dev/nbd0 - /usr/sbin/sgdisk -t 2:$SPDK_GPT_GUID /dev/nbd0 + sgdisk -t 1:$SPDK_GPT_GUID /dev/nbd0 + sgdisk -t 2:$SPDK_GPT_GUID /dev/nbd0 fi killprocess $nbd_pid