From: Oleg Drokin <green@whamcloud.com>
Date: Thu, 23 May 2013 16:18:19 +0000 (-0400)
Subject: Revert "LU-3264 tests: import ZFS pool which has file-based vdev"
X-Git-Tag: 2.4.51~82
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d2d68b18396c95dd273f6c6d8e11f080a9ac3051

Revert "LU-3264 tests: import ZFS pool which has file-based vdev"

Unfortunately zfs testing took a nosedive after this commit was included.

This reverts commit 3dffd5b5c4c95f29e718cab63e8ef1c7da0c1f8b.
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index f9ab7a6..231b6c3 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -916,7 +916,6 @@ import_zpool() {
 	poolname=$(zpool_name $facet)
 
 	if [[ -n "$poolname" ]]; then
-		opts+=" -d $(dirname $(facet_vdevice $facet))"
 		do_facet $facet "$ZPOOL import -f $opts $poolname"
 	fi
 }