land v0.9.1 on HEAD, in preparation for a 1.0.x branch

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

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 69f6ad9..1877666 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -1,38 +1,28 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
+LCONF=${LCONF:-../utils/lconf}
+NAME=${NAME:-local}
 
-NETWORK=tcp
-LOCALHOST=localhost
-SERVER=localhost
-PORT=1234
+config=$NAME.xml
+mkconfig=$NAME.sh
 
-setup_portals
-setup_lustre
+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_lite -o device=3 none /mnt/lustre
+${LCONF} $portals_opt $lustre_opt $node_opt $@ $conf_opt || exit 2