X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmount.sh;h=de200036f29602c8d9048df142c86871e08ab45f;hb=96ec6856f91f7f9031cfce4273c714d72cfe59ae;hp=78bcc0a32f3621ac1cdd1a8cce523bc4df60023a;hpb=d020fa2e79b4fd63385f4656adfcf6ef22333d55;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 78bcc0a..de20003 100755
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,15 +1,34 @@
 #!/bin/sh
 # suggested boilerplate for test script
 
-LCONF=../utils/lconf
+LCONF=${LCONF:-../utils/lconf}
 NAME=${NAME:-local}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
 
-if [ ! -f $local.xml -o $mkconfig -nt $local.xml ]; then
-   $mkconfig $config || exit 1
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
 fi
 
-${LCONF} --reformat --gdb $config || exit 2
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
+
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    sh $mkconfig $config || exit 1
+    conf_opt="$config"
+fi    
+
+[ "$NODE" ] && node_opt="--node $NODE"
+
+if [ "$1" = "-v" ]; then
+  verbose="-v"
+fi
+
+[ -x $LCONF ] || chmod a+rx $LCONF
 
+${LCONF} $portals_opt $lustre_opt $node_opt --reformat --gdb \
+    $verbose $conf_opt  || exit 2