X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fllmount.sh;h=253932f6c18ae56a0ad71c8c7b82fb628dd8bd80;hp=de200036f29602c8d9048df142c86871e08ab45f;hb=87d92f4af2b977a811037033c8c7e9f89a5fc32a;hpb=96ec6856f91f7f9031cfce4273c714d72cfe59ae

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index de20003..253932f 100755
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,34 +1,43 @@
 #!/bin/sh
 # suggested boilerplate for test script
 
-LCONF=${LCONF:-../utils/lconf}
+export PATH=`dirname $0`/../utils:$PATH
+
+LCONF=${LCONF:-lconf}
 NAME=${NAME:-local}
+LLMOUNT=${LLMOUNT:-llmount}
+SECURITY=${SECURITY:-"null"}
+
+config=$(dirname $0)/$NAME.xml
+mkconfig=$(dirname $0)/$NAME.sh
 
-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"
+    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"
 
-if [ "$1" = "-v" ]; then
-  verbose="-v"
-fi
+${LCONF} $NOMOD --sec $SECURITY $portals_opt $lustre_opt $node_opt \
+         ${REFORMAT:---reformat} $@ $conf_opt  || exit 5
 
-[ -x $LCONF ] || chmod a+rx $LCONF
+if [ "$MOUNT2" ]; then
+       $LLMOUNT -v -o sec=$SECURITY `hostname`:/mds1/client $MOUNT2 || exit 6
+fi
 
-${LCONF} $portals_opt $lustre_opt $node_opt --reformat --gdb \
-    $verbose $conf_opt  || exit 2