- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

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

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 4cb6029..de20003 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -5,11 +5,30 @@ LCONF=${LCONF:-../utils/lconf}
 NAME=${NAME:-local}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
 
-if [ ! -f $config -o $mkconfig -nt $config ]; 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