X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=6a25571d7fdc1a0f23a46066bb536c2452aac885;hp=49d0aa18d7507873e6567227cf219b3ecccb79c1;hb=55b8a464fc8a101ae7ceeb6b40f2e3c6f51d7b6e;hpb=3a1e40d92baeb54fa93d527af55105a1e3a4a289

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 49d0aa1..6a25571 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1228,7 +1228,7 @@ test_32newtarball() {
 			  sed -e 's/\./_/g')	# E.g., "1.8.7" -> "1_8"
 	dst=$(cd $dst; pwd)
 	pushd $tmp/img
-	tar cjvf $dst/disk$version-$FSTYPE.tar.bz2 -S *
+	tar cjvf $dst/disk$version-$(facet_fstype $SINGLEMDS).tar.bz2 -S *
 	popd
 
 	rm -r $tmp
@@ -1253,9 +1253,8 @@ t32_check() {
 		exit 0
 	fi
 
-	local IMGTYPE=$FSTYPE
+	local IMGTYPE=$(facet_fstype $SINGLEMDS)
 
-	[ ! -z "$MDSFSTYPE" ] && IMGTYPE=$MDSFSTYPE
 	tarballs=$($r find $RLUSTRE/tests -maxdepth 1 -name \'disk*-$IMGTYPE.tar.bz2\')
 
 	if [ -z "$tarballs" ]; then
@@ -1303,7 +1302,8 @@ t32_reload_modules() {
 
 	while ((i < 20)); do
 		echo "Unloading modules on $node: Attempt $i"
-		do_rpc_nodes $node $LUSTRE_RMMOD $FSTYPE && all_removed=true
+		do_rpc_nodes $node $LUSTRE_RMMOD $(facet_fstype $SINGLEMDS) &&
+			all_removed=true
 		do_rpc_nodes $node check_mem_leak || return 1
 		if $all_removed; then
 			load_modules