land 0.5.20.3 b_devel onto HEAD (b_devel will remain)

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

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index f33b3eb..6531055 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -4,10 +4,18 @@ LCONF=${LCONF:-../utils/lconf}
 NAME=${NAME:-local}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
+
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
+
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
 
 if [ ! -f $config -o $mkconfig -nt $config ]; then
-   $mkconfig $config || exit 1
+   sh $mkconfig $config || exit 1
 fi
 
-${LCONF} --gdb $config || exit 2
+${LCONF} $portals_opt $lustre_opt --gdb $config || exit 2