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 b16d19d..094abda 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -3,55 +3,29 @@
 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 || exit -1
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o || exit -1
+setup_portals
+setup_lustre
 
-$R/usr/src/portals/linux/utils/acceptor 1234 &
+new_fs ext2 /tmp/ost 10000
+OST=$LOOPDEV
+MDSFS=ext2
+new_fs ${MDSFS} /tmp/mds 10000
+MDS=$LOOPDEV
 
-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
+echo 0xffffffff > /proc/sys/portals/debug
 
-$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 -b 4096 -F /tmp/ost
-losetup ${LOOP}0 /tmp/ost || exit -1
-
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-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
+$OBDCTL <<EOF
 device 0
 attach mds
-setup ${LOOP}1 ext2
+setup ${MDS} ${MDSFS}
 device 1
-attach obdext2
-setup ${LOOP}0
+attach obdfilter
+setup ${OST} ext2
 device 2
 attach ost
 setup 1
@@ -61,5 +35,4 @@ 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