Merged branch 'peter' with the tip. Pre-merge tag is 't_20020302_networking'.

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

diff --git a/lustre/tests/ostreq.sh b/lustre/tests/ostreq.sh
index 685488f..ab26b7c 100644 (file)
--- a/lustre/tests/ostreq.sh
+++ b/lustre/tests/ostreq.sh
@@ -12,20 +12,21 @@ 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
+
 $R/usr/src/portals/linux/utils/ptlctl <<EOF
-mynid
+mynid localhost
 setup tcp
 connect $SERVER 1234
-add_uuid ost
 add_uuid self
+add_uuid ost
 quit
 EOF
 
-insmod $R/usr/src/obd/rpc/ptlrpc.o || exit -1
-insmod $R/usr/src/obd/class/obdclass.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
 
 dd if=/dev/zero of=/tmp/fs bs=1024 count=10000
 mke2fs -F /tmp/fs
@@ -36,6 +37,8 @@ echo 4095 > /proc/sys/obd/trace
 
 mknod /dev/obd c 10 241
 
+$R/usr/src/obd/utils/obdctl modules > $R/tmp/ogdb
+
 $R/usr/src/obd/utils/obdctl <<EOF
 device 0
 attach obdext2
@@ -45,6 +48,6 @@ attach ost
 setup 0
 device 2
 attach osc
-setup
+setup -1
 quit
 EOF