X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=2fa00075a68575adb7e31012a2786df656128d07;hp=76c6c3a0daa3877c120f4f01f09402b954b42e7a;hb=d25e7654f798060f6b671c3b65949a70b8c67f58;hpb=64e7bea80a303488e0e851970f27bd5b884100f2

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 76c6c3a..2fa0007 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2598,8 +2598,9 @@ ostdevname() {
 			#if $OSTDEVn isn't defined, default is $OSTDEVBASE + num
 			eval DEVPTR=${!DEVNAME:=${OSTDEVBASE}${num}};;
 		zfs )
-			#dataset name is independent of vdev device names
-			eval DEVPTR=${FSNAME}-ost${num}/ost${num};;
+			#try $OSTDEVn then $OSTDEVBASE + num then zfs default
+			local foo=${OSTDEVBASE:-${FSNAME}-ost${num}/ost}${num}
+			eval DEVPTR=${!DEVNAME:=$foo};;
 		* )
 			error "unknown fstype!";;
 	esac
@@ -2638,8 +2639,9 @@ mdsdevname() {
 			#if $MDSDEVn isn't defined, default is $MDSDEVBASE + num
 			eval DEVPTR=${!DEVNAME:=${MDSDEVBASE}${num}};;
 		zfs )
-			#dataset name is independent of vdev device names
-			eval DEVPTR=${FSNAME}-mdt${num}/mdt${num};;
+			# try $MDSDEVn then $MDSDEVBASE + num then zfs default
+			local foo=${MDSDEVBASE:-${FSNAME}-mdt${num}/mdt}${num}
+			eval DEVPTR=${!DEVNAME:=$foo};;
 		* )
 			error "unknown fstype!";;
 	esac