adjust krb5 related scripts, add krb5 support in replay-ost-single,

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

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 9dd1ece..253932f 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -5,26 +5,39 @@ export PATH=`dirname $0`/../utils:$PATH
 
 LCONF=${LCONF:-lconf}
 NAME=${NAME:-local}
+LLMOUNT=${LLMOUNT:-llmount}
+SECURITY=${SECURITY:-"null"}
 
-config=$NAME.xml
-mkconfig=$NAME.sh
+config=$(dirname $0)/$NAME.xml
+mkconfig=$(dirname $0)/$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"
+    portals_opt="--portals=$PORTALS"
 fi
 
 if [ "$LUSTRE" ]; then
-  lustre_opt="--lustre=$LUSTRE"
+    lustre_opt="--lustre=$LUSTRE"
 fi
 
 if [ "$LDAPURL" ]; then
     conf_opt="--ldapurl $LDAPURL --config $NAME"
 else
-    sh $mkconfig $config || exit 1
+    sh $mkconfig $config || exit 4
     conf_opt="$config"
 fi    
 
 [ "$NODE" ] && node_opt="--node $NODE"
+[ "$DEBUG" ] && debug_opt="--ptldebug=$DEBUG"
+
+${LCONF} $NOMOD --sec $SECURITY $portals_opt $lustre_opt $node_opt \
+         ${REFORMAT:---reformat} $@ $conf_opt  || exit 5
+
+if [ "$MOUNT2" ]; then
+       $LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 6
+fi
 
-${LCONF} $NOMOD $portals_opt $lustre_opt $node_opt ${REFORMAT:---reformat} $@ \
-       $conf_opt  || exit 2