land b_hd_sec_client_oss onto HEAD.

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

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 6531055..a9de5e4 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -1,11 +1,21 @@
 #!/bin/sh
 
-LCONF=${LCONF:-../utils/lconf}
+export PATH=`dirname $0`/../utils:$PATH
+
+LCONF=${LCONF:-lconf}
 NAME=${NAME:-local}
+LLMOUNT=${LLMOUNT:-llmount}
+SECURITY=${SECURITY:-"null"}
 
 config=$NAME.xml
 mkconfig=$NAME.sh
 
+. krb5_env.sh
+
+start_krb5_kdc || exit 1
+start_lsvcgssd || exit 2
+start_lgssd || exit 3
+
 if [ "$PORTALS" ]; then
   portals_opt="--portals=$PORTALS"
 fi
@@ -14,8 +24,21 @@ if [ "$LUSTRE" ]; then
   lustre_opt="--lustre=$LUSTRE"
 fi
 
-if [ ! -f $config -o $mkconfig -nt $config ]; then
-   sh $mkconfig $config || exit 1
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    if [ ! -f $config -o $mkconfig -nt $config ]; then
+       sh $mkconfig $config || exit 4
+    fi
+    conf_opt="$config"
+fi    
+
+[ "$NODE" ] && node_opt="--node $NODE"
+
+${LCONF} $NOMOD --mds_sec $SECURITY $portals_opt $lustre_opt $node_opt \
+         $@ $conf_opt  || exit 5
+
+if [ "$MOUNT2" ]; then
+       $LLMOUNT -v -o mds_sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 6
 fi
 
-${LCONF} $portals_opt $lustre_opt --gdb $config || exit 2