* allow lmc and lconf paths to be overridden in installed scripts

diff --git a/lustre/.cvsignore b/lustre/.cvsignore
index 2172c53..953c699 100644 (file)
--- a/lustre/.cvsignore
+++ b/lustre/.cvsignore
@@ -9,3 +9,4 @@ Makefile.in
 .deps
 tags
 TAGS
+lustre*.tar.gz

diff --git a/lustre/tests/.cvsignore b/lustre/tests/.cvsignore
index f2ce028..8ede66f 100644 (file)
--- a/lustre/tests/.cvsignore
+++ b/lustre/tests/.cvsignore
@@ -21,3 +21,4 @@ test_brw
 newfile
 openclose
 createdestroy
+lovstripe

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index 6a7b110..f6cbad6 100644 (file)
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
 
 config=echo.xml
-lmc=../utils/lmc
-lconf=../utils/lconf
+LCONF=${LCONF:-../utils/lconf}
+LMC=${LMC:-../utils/lmc}
 
 SERVER=localhost
 CLIENT=localhost
 
 # create nodes
-$lmc -o $config --node $SERVER --net $SERVER tcp || exit 1
-$lmc -m $config --node $SERVER --obdtype=obdecho --ost || exit 2
+$LMC -o $config --node $SERVER --net $SERVER tcp || exit 1
+$LMC -m $config --node $SERVER --obdtype=obdecho --ost || exit 2
 
 # force the osc to be configured (this is normally done when it is mounted)
-$lmc -m $config --node $CLIENT --osc OSC_$SERVER || exit 3
+$LMC -m $config --node $CLIENT --osc OSC_$SERVER || exit 3
 
-$lconf --gdb $config || exit 4
+$LCONF --gdb $config || exit 4
 
 cat <<EOF
 

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 78bcc0a..f1d15a1 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # suggested boilerplate for test script
 
-LCONF=../utils/lconf
+LCONF=${LCONF:-../utils/lconf}
 NAME=${NAME:-local}
 
 config=$NAME.xml

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 905d205..8d6ff91 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LCONF=../utils/lconf
+LCONF=${LCONF:-../utils/lconf}
 
 if [ ! -f local.xml ]; then
    ./local.sh