-small is better for now

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

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index bd3e04c..bf0e991 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,46 +1,65 @@
 #!/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/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
+mknod /dev/portals c 10 240
+
+insmod $R/usr/src/portals/linux/oslib/portals.o || exit -1
+insmod $R/usr/src/portals/linux/socknal/ksocknal.o || exit -1
+
+$R/usr/src/portals/linux/utils/acceptor 1234 &
+
+insmod $R/usr/src/obd/class/obdclass.o || exit -1
+insmod $R/usr/src/obd/rpc/ptlrpc.o || exit -1
+insmod $R/usr/src/obd/ext2obd/obdext2.o || exit -1
+insmod $R/usr/src/obd/ost/ost.o || exit -1
+insmod $R/usr/src/obd/osc/osc.o || exit -1
+insmod $R/usr/src/obd/mds/mds.o || exit -1
+insmod $R/usr/src/obd/mdc/mdc.o || exit -1
+insmod $R/usr/src/obd/llight/llight.o || exit -1
+
+$R/usr/src/obd/utils/obdctl modules > $R/tmp/ogdb
+echo "The GDB module script is in /tmp/ogdb.  Press enter to continue"
+read
+
+$R/usr/src/portals/linux/utils/ptlctl <<EOF
+mynid localhost
+setup tcp
+connect localhost 1234
+add_uuid self
+add_uuid mds
+add_uuid ost
+quit
+EOF
 
 dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -F /tmp/ost
-losetup /dev/loop/0 /tmp/ost
+mke2fs -b 4096 -F /tmp/ost
+losetup ${LOOP}0 /tmp/ost || exit -1
 
 dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -F /tmp/mds
-losetup /dev/loop/1 /tmp/mds
+mke2fs -b 4096 -F /tmp/mds
+losetup ${LOOP}1 /tmp/mds || exit -1
 
 mknod /dev/obd c 10 241
+echo 8291 > /proc/sys/obd/debug
+echo 8291 > /proc/sys/obd/trace
 
 $R/usr/src/obd/utils/obdctl <<EOF
 device 0
 attach mds
-setup /dev/loop/1 ext2
+setup ${LOOP}1 ext2
 device 1
 attach obdext2
-setup /dev/loop/0
+setup ${LOOP}0
 device 2
 attach ost
 setup 1
 device 3
 attach osc
-setup 2
+setup
 quit
 EOF
 
 mkdir /mnt/obd
 # mount -t lustre_light -o device=3 none /mnt/obd
-
-mknod /dev/request c 10 244
-# $R/usr/src/obd/utils/testreq
-
-