b=1719

[fs/lustre-release.git] / lustre / tests / llmount.sh

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 3ee4a53..29dfec9 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,15 +1,30 @@
 #!/bin/sh
 # suggested boilerplate for test script
 
-LCONF=../utils/lconf
-NAME=local
+export PATH=`dirname $0`/../utils:$PATH
+
+LCONF=${LCONF:-lconf}
+NAME=${NAME:-local}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
+
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
 
-if [ ! -f $local.xml -o $mkconfig -nt $local.xml ]; then
-   $mkconfig $config || exit 1
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
 fi
 
-${LCONF} --reformat --gdb $config || exit 2
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    sh $mkconfig $config || exit 1
+    conf_opt="$config"
+fi    
+
+[ "$NODE" ] && node_opt="--node $NODE"
 
+${LCONF}  $portals_opt $lustre_opt $node_opt ${REFORMAT:---reformat} $@ \
+       $conf_opt  || exit 2