From e4e321c94061548b13b40d1918cb3ed5a0f700f4 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Tue, 13 May 2008 18:42:05 +0000
Subject: [PATCH] b=15745 i=Adilger

ignore rm error if TMP is on NFS
---
 lustre/tests/conf-sanity.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c966af2..d8d91d8 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1169,7 +1169,7 @@ test_32a() {
 
 	$TUNEFS --mgsnode=`hostname` $TMP/$tdir/ost1 || error "tunefs failed"
 	start ost1 $TMP/$tdir/ost1 "-o loop" || return 5
-        UUID=$(cat lctl get_param -n obdfilter.lustre-OST0000.uuid)
+	UUID=$(lctl get_param -n obdfilter.lustre-OST0000.uuid)
 	echo OST uuid $UUID
 	[ "$UUID" == "ost1_UUID" ] || error "UUID is wrong: $UUID" 
 
@@ -1204,7 +1204,7 @@ test_32a() {
         start mds $TMP/$tdir/mds "-o loop,exclude=lustre-OST0000" || return 12
         cleanup_nocli
 
-	[ -d $TMP/$tdir ] && rm -rf $TMP/$tdir
+	[ -d $TMP/$tdir ] && { rm -rf $TMP/$tdir || true; }	# true is only for TMP on NFS
 }
 run_test 32a "Upgrade from 1.4 (not live)"
 
@@ -1260,7 +1260,7 @@ test_32b() {
 	echo "ok."
 
 	cleanup
-	[ -d $TMP/$tdir ] && rm -rf $TMP/$tdir
+	[ -d $TMP/$tdir ] && { rm -rf $TMP/$tdir || true; }	# true is only for TMP on NFS
 }
 run_test 32b "Upgrade from 1.4 with writeconf"
 
-- 
1.8.3.1