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 ed089fb..094abda 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -3,17 +3,13 @@
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-setup
+NETWORK=tcp
+LOCALHOST=localhost
+SERVER=localhost
+PORT=1234
 
-$PTLCTL <<EOF
-mynid localhost
-setup tcp
-connect localhost 1234
-add_uuid self
-add_uuid mds
-add_uuid ost
-quit
-EOF
+setup_portals
+setup_lustre
 
 new_fs ext2 /tmp/ost 10000
 OST=$LOOPDEV
@@ -21,16 +17,15 @@ 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 ${MDS} ${MDSFS}
 device 1
-attach obdext2
-setup ${OST}
+attach obdfilter
+setup ${OST} ext2
 device 2
 attach ost
 setup 1
@@ -40,4 +35,4 @@ setup -1
 quit
 EOF
 
-mount -t lustre_light -o device=3 none /mnt/obd
+mount -t lustre_lite -o device=3 none /mnt/lustre