From 8821dcb14ccc1222d5d1b359d20144c80d6d982e Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 11 Feb 2004 18:19:32 +0000
Subject: [PATCH] Have the loopback OST/MDS files use the same names as the
 other tests, so that my root filesystem doesn't fill up with all the
 different files.

---
 lustre/tests/cfg/insanity-local.sh | 4 ++--
 lustre/tests/cfg/local.sh          | 6 +++---
 lustre/tests/cfg/mdev.sh           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lustre/tests/cfg/insanity-local.sh b/lustre/tests/cfg/insanity-local.sh
index d0df708..56a8779 100644
--- a/lustre/tests/cfg/insanity-local.sh
+++ b/lustre/tests/cfg/insanity-local.sh
@@ -16,11 +16,11 @@ MOUNT=${MOUNT:-"/mnt/lustre"}
 #CLIENT_UPCALL=${CLIENT_UPCALL:-`pwd`/client-upcall-mdev.sh}
 UPCALL=${CLIENT_UPCALL:-`pwd`/replay-single-upcall.sh}
 
-MDSDEV=${MDSDEV:-$ROOT/tmp/mds-`hostname`}
+MDSDEV=${MDSDEV:-$ROOT/tmp/mds1-`hostname`}
 MDSSIZE=${MDSSIZE:-10000} #50000000
 MDSJOURNALSIZE=${MDSJOURNALSIZE:-0}
 
-OSTDEV=${OSTDEV:-"$ROOT/tmp/ost-`hostname`-%d"}
+OSTDEV=${OSTDEV:-"$ROOT/tmp/ost%d-`hostname`"}
 OSTSIZE=${OSTSIZE:=10000} #50000000
 OSTJOURNALSIZE=${OSTJOURNALSIZE:-0}
 
diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 6fe3aa8..9398d07 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -12,16 +12,16 @@ NETTYPE=${NETTYPE:-tcp}
 
 MOUNT=${MOUNT:-"/mnt/lustre"}
 MOUNT1=${MOUNT1:-$MOUNT}
-MOUNT2=${MOUNT2:-"/mnt/lustre2"}
+MOUNT2=${MOUNT2:-${MOUNT}2}
 DIR=${DIR:-$MOUNT}
 DIR2=${DIR2:-$MOUNT1}
 PTLDEBUG=${PTLDEBUG:-0x3f0400}
 SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
 PDSH=${PDSH:-no_dsh}
 
-MDSDEV=${MDSDEV:-$ROOT/tmp/mds-`hostname`}
+MDSDEV=${MDSDEV:-$ROOT/tmp/mds1-`hostname`}
 MDSSIZE=${MDSSIZE:-10000}
-OSTDEV=${OSTDEV:-$ROOT/tmp/ost-`hostname`}
+OSTDEV=${OSTDEV:-$ROOT/tmp/ost1-`hostname`}
 OSTSIZE=${OSTSIZE:-50000}
 FSTYPE=${FSTYPE:-ext3}
 TIMEOUT=${TIMEOUT:-10}
diff --git a/lustre/tests/cfg/mdev.sh b/lustre/tests/cfg/mdev.sh
index dd373ba..7d50f07 100644
--- a/lustre/tests/cfg/mdev.sh
+++ b/lustre/tests/cfg/mdev.sh
@@ -17,7 +17,7 @@ PDSH=${PDSH:-pdsh -S -w}
 
 MDSDEV=${MDSDEV:-/dev/sda1}
 MDSSIZE=${MDSSIZE:-50000}
-OSTDEV=${OSTDEV:-/tmp/ost-`hostname`}
+OSTDEV=${OSTDEV:-/tmp/ost1-`hostname`}
 OSTSIZE=${OSTSIZE:-20000}
 FSTYPE=${FSTYPE:-ext3}
 TIMEOUT=${TIMEOUT:-10}
-- 
1.8.3.1