b=3983

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

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index ae244c1..5aa8601 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -1,13 +1,30 @@
 #!/bin/sh
 
-LCONF=${LCONF:-../utils/lconf}
+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 $config -o $mkconfig -nt $config ]; then
-   sh $mkconfig $config || exit 1
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
 fi
 
-${LCONF} --gdb $config || exit 2
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    if [ ! -f $config -o $mkconfig -nt $config ]; then
+       sh $mkconfig $config || exit 1
+    fi
+    conf_opt="$config"
+fi    
+
+[ "$NODE" ] && node_opt="--node $NODE"
+
+${LCONF} $NOMOD $portals_opt $lustre_opt $node_opt $@ $conf_opt || exit 2