X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllrmount.sh;h=b12c1aebe562e46e2b84945bf4b4a34a2d4c4656;hb=576c9a8212bc6607146d99e3413f7a24cbf91b5c;hp=ca1ed311379caba2355728756047779333229067;hpb=52b625220e61a0a5bac9604c9260f29766717c81;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index ca1ed31..b12c1ae 100755
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -1,42 +1,28 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
+LCONF=${LCONF:-../utils/lconf}
+NAME=${NAME:-local}
 
-setup
+config=$NAME.xml
+mkconfig=$NAME.sh
 
-$PTLCTL <<EOF
-mynid localhost
-setup tcp
-connect localhost 1234
-add_uuid self
-add_uuid mds
-add_uuid ost
-quit
-EOF
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
 
-old_fs ext2 /tmp/ost 80000
-OST=$LOOPDEV
-MDSFS=ext2
-old_fs ${MDSFS} /tmp/mds 10000
-MDS=$LOOPDEV
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
 
-echo 0xffffffff > /proc/sys/portals/debug
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    if [ ! -f $config -o $mkconfig -nt $config ]; then
+	sh $mkconfig $config || exit 1
+    fi
+    conf_opt="$config"
+fi    
 
-$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
+[ "$NODE" ] && node_opt="--node $NODE"
 
-mount -t lustre_light -o device=3 none /mnt/obd
+${LCONF} $portals_opt $lustre_opt $node_opt --gdb $conf_opt || exit 2