Add LDLM setup/cleanup to subsystems set up via new configuration scripts.

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

diff --git a/lustre/tests/lllocalmount.sh b/lustre/tests/lllocalmount.sh
index 70b5400..70e2250 100755 (executable)
--- a/lustre/tests/lllocalmount.sh
+++ b/lustre/tests/lllocalmount.sh
@@ -1,48 +1,39 @@
 #!/bin/sh
 
-R=/r
+SRCDIR="`dirname $0`"
+. $SRCDIR/common.sh
 
-mknod /dev/portals c 10 240
+NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
 
-insmod $R/usr/src/portals/linux/oslib/portals.o
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o
+setup_portals
+setup_lustre
 
-$R/usr/src/portals/linux/utils/acceptor 1234 &
+new_fs ext2 /tmp/ost 10000
+OST=${LOOPDEV}
 
-insmod $R/usr/src/obd/rpc/ptlrpc.o
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
-insmod $R/usr/src/obd/ost/ost.o
-insmod $R/usr/src/obd/osc/osc.o
-insmod $R/usr/src/obd/mds/mds.o
-insmod $R/usr/src/obd/mdc/mdc.o
-insmod $R/usr/src/obd/llight/llight.o
+MDSFS=ext2
+new_fs ${MDSFS} /tmp/mds 10000
+MDS=${LOOPDEV}
 
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup /dev/loop/0 /tmp/ost
+echo 0xffffffff > /proc/sys/portals/debug
 
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/mds
-losetup /dev/loop/1 /tmp/mds
-
-mknod /dev/obd c 10 241
-
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 0
-attach mds
-setup /dev/loop/1 ext2
+attach mds MDSDEV
+setup ${MDS} ${MDSFS}
 device 1
-attach obdext2
-setup /dev/loop/0
+attach obdext2 OBDDEV
+setup ${OST}
 device 2
-attach ost
-setup 1
+attach ost OSTDEV
+setup \$OBDDEV
 device 3
-attach osc
+attach osc OSCDEV
 setup 2
 quit
 EOF
 
-mkdir /mnt/obd
-# mount -t lustre_light -o device=3 none /mnt/obd
+# mount -t lustre_lite -o device=3 none /mnt/lustre