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

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

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 3de7fcf..0cc2853 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -13,6 +13,8 @@ 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"
@@ -26,23 +28,17 @@ if [ "$LDAPURL" ]; then
     conf_opt="--ldapurl $LDAPURL --config $NAME"
 else
     if [ ! -f $config -o $mkconfig -nt $config ]; then
-       sh $mkconfig $config || exit 2
+       sh $mkconfig $config || exit 4
     fi
     conf_opt="$config"
 fi    
 
 [ "$NODE" ] && node_opt="--node $NODE"
 
-# We'd better start lsvcgssd after gss modules loaded.
-# remove this if we don't depend on lsvcgssd in the future
-${LCONF} --nosetup --sec $SECURITY $portals_opt $node_opt $@ $conf_opt || exit 3
-start_lsvcgssd || exit 4
-start_lgssd || exit 5
-
 ${LCONF} $NOMOD --sec $SECURITY $portals_opt $lustre_opt $node_opt \
-         $@ $conf_opt  || exit 6
+         $@ $conf_opt  || exit 5
 
 if [ "$MOUNT2" ]; then
-       $LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 7
+       $LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 6
 fi