Actually mount the filesystem in llmount.sh.

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

diff --git a/lustre/tests/llmount-server.sh b/lustre/tests/llmount-server.sh
index c1439dd..a506e7a 100644 (file)
--- a/lustre/tests/llmount-server.sh
+++ b/lustre/tests/llmount-server.sh
@@ -1,44 +1,31 @@
 #!/bin/sh
 
+export PATH=/sbin:/usr/sbin:$PATH
+
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-mknod /dev/portals c 10 240
-
-insmod $R/usr/src/portals/linux/oslib/portals.o
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o
-
-$R/usr/src/portals/linux/utils/acceptor 1234 &
-
-$R/usr/src/portals/linux/utils/ptlctl <<EOF
-mynid
-setup tcp
-add_uuid self
-EOF
-
-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/mds/mds.o
-
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup ${LOOP}0 /tmp/ost
+NETWORK=tcp
+LOCALHOST=dev4
+SERVER=dev4
+PORT=1234
 
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/mds
-losetup ${LOOP}1 /tmp/mds
+setup
+setup_portals
 
-mknod /dev/obd c 10 241
+new_fs ext2 /tmp/ost 6000000
+OST=${LOOPDEV}
+MDSFS=ext2
+new_fs ${MDSFS} /tmp/mds 50000
+MDS=${LOOPDEV}
 
-$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
+setup ${OST}
 device 2
 attach ost
 setup 1