land v0.9.1 on HEAD, in preparation for a 1.0.x branch

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

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 4376a58..1877666 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -1,10 +1,28 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`/"
-. $SRCDIR/common.sh
+LCONF=${LCONF:-../utils/lconf}
+NAME=${NAME:-local}
 
-export DEBUG_WAIT=yes
-. $SRCDIR/llrsetup.sh $SRCDIR/net-local.cfg $SRCDIR/client-mount.cfg $SRCDIR/mds.cfg $SRCDIR/obdext2.cfg $SRCDIR/ldlm.cfg || exit 2
+config=$NAME.xml
+mkconfig=$NAME.sh
 
-debug_client_on
-#debug_client_off
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
+
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
+
+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} $portals_opt $lustre_opt $node_opt $@ $conf_opt || exit 2