Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted #974 for now as it causes problems for people.
[fs/lustre-release.git]
/
lustre
/
tests
/
llrmount.sh
diff --git
a/lustre/tests/llrmount.sh
b/lustre/tests/llrmount.sh
index
4dbd546
..
1877666
100755
(executable)
--- a/
lustre/tests/llrmount.sh
+++ b/
lustre/tests/llrmount.sh
@@
-1,44
+1,28
@@
#!/bin/sh
#!/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 ptlrpc
-setup
-device 4
-attach ldlm
-setup
-device 5
-attach osc
-setup -1
-quit
-EOF
+[ "$NODE" ] && node_opt="--node $NODE"
-mount -t lustre_lite -o device=5 none /mnt/lustre
+${LCONF} $portals_opt $lustre_opt $node_opt $@ $conf_opt || exit 2