X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllrmount.sh;h=5aa8601ed13feba22c3b2281e6b13480673e57d0;hb=960c1ec8c030cc48b3208e892849dcf5722f28aa;hp=51a559ef9a216e7e558f5f1e22d62b9428eeaaee;hpb=251d9e417a5b7e31e1036cca9501e32958df0b01;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 51a559e..5aa8601 100755
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -1,9 +1,30 @@
 #!/bin/sh
 
-LCONF=../utils/lconf
+export PATH=`dirname $0`/../utils:$PATH
 
-if [ ! -f local.xml ]; then
-   ./local.sh
+LCONF=${LCONF:-lconf}
+NAME=${NAME:-local}
+
+config=$NAME.xml
+mkconfig=$NAME.sh
+
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
+
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
 fi
 
-${LCONF} --gdb local.xml
+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