common.sh: move all of the portals setup from setup() to setup_portals().

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

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index bed10ae..094abda 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,47 +1,38 @@
 #!/bin/sh
 
-R=/r
+SRCDIR="`dirname $0`"
+. $SRCDIR/common.sh
 
-insmod /lib/modules/2.4.17/kernel/drivers/block/loop.o
-insmod $R/usr/src/portals/linux/oslib/portals.o
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o
-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
+NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
 
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup /dev/loop/0 /tmp/ost
+setup_portals
+setup_lustre
 
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/mds
-losetup /dev/loop/1 /tmp/mds
+new_fs ext2 /tmp/ost 10000
+OST=$LOOPDEV
+MDSFS=ext2
+new_fs ${MDSFS} /tmp/mds 10000
+MDS=$LOOPDEV
 
-mknod /dev/obd c 10 241
+echo 0xffffffff > /proc/sys/portals/debug
 
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 0
 attach mds
-setup /dev/loop/1 ext2
+setup ${MDS} ${MDSFS}
 device 1
-attach obdext2
-setup /dev/loop/0
+attach obdfilter
+setup ${OST} ext2
 device 2
 attach ost
 setup 1
 device 3
 attach osc
-setup 2
+setup -1
 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