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

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 3fb8c9d..253932f 100755
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,38 +1,43 @@
 #!/bin/sh
+# suggested boilerplate for test script
+
+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
+
+. krb5_env.sh
+start_krb5_kdc || exit 1
+start_lsvcgssd || exit 2
+start_lgssd || exit 3
+
+if [ "$PORTALS" ]; then
+    portals_opt="--portals=$PORTALS"
+fi
+
+if [ "$LUSTRE" ]; then
+    lustre_opt="--lustre=$LUSTRE"
+fi
+
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    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
 
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
-
-NETWORK=tcp
-LOCALHOST=localhost
-SERVER=localhost
-PORT=1234
-
-setup
-setup_portals
-
-new_fs ext2 /tmp/ost 10000
-OST=$LOOPDEV
-MDSFS=ext2
-new_fs ${MDSFS} /tmp/mds 10000
-MDS=$LOOPDEV
-
-echo 0xffffffff > /proc/sys/portals/debug
-
-$OBDCTL <<EOF
-device 0
-attach mds
-setup ${MDS} ${MDSFS}
-device 1
-attach obdext2
-setup ${OST}
-device 2
-attach ost
-setup 1
-device 3
-attach osc
-setup -1
-quit
-EOF
-
-mount -t lustre_light -o device=3 none /mnt/obd