- fixes in insanity.sh

diff --git a/lustre/tests/cfg/lmv.sh b/lustre/tests/cfg/lmv.sh
index eb77a76..47a3779 100644 (file)
--- a/lustre/tests/cfg/lmv.sh
+++ b/lustre/tests/cfg/lmv.sh
@@ -24,6 +24,7 @@ SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
 
 TMP=${TMP:-/tmp}
 
+MDSDEV=${MDSDEV:-$TMP/${FSNAME}-mdt1}
 MDSCOUNT=${MDSCOUNT:-3}
 MDSDEVBASE=${MDSDEVBASE:-$TMP/${FSNAME}-mdt}
 MDSSIZE=${MDSSIZE:-100000}

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index f72d0a3..47b2933 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -17,7 +17,7 @@ CLEANUP=${CLEANUP:-"cleanup"}
 
 build_test_filter
 
-assert_env mds_HOST MDS_MKFS_OPTS MDSDEV
+assert_env mds_HOST MDS_MKFS_OPTS
 assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
 assert_env LIVE_CLIENT FSNAME
 
@@ -226,7 +226,7 @@ test_2() {
     start_ost 1 || return 2
 
     wait_for $SINGLEMDS
-    start $SINGLEMDS $MDSDEV $MDS_MOUNT_OPTS || return $?
+    start $SINGLEMDS `mdsdevname 1` $MDS_MOUNT_OPTS || return $?
 
     #Check FS
     wait $DFPID
@@ -300,8 +300,8 @@ test_4() {
     wait_for ost1
     start_ost 1
     
-    wait_for mds
-    start mds $MDSDEV $MDS_MOUNT_OPTS
+    wait_for $SINGLEMDS
+    start $SINGLEMDS `mdsdevname 1` $MDS_MOUNT_OPTS
     #Check FS
     
     wait $DFPIDA