From 32006fa239f2d7b91306719fee6159fce28d9179 Mon Sep 17 00:00:00 2001
From: pschwan <pschwan>
Date: Thu, 8 Aug 2002 09:43:43 +0000
Subject: [PATCH] - lctl seems to exit immediately if we try to 'mynid' on elan
 in the scripts, so don't do that. - kqswnal is safe to unload now

---
 lustre/tests/common.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index 02ae617..005e576 100644
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -216,8 +216,10 @@ setup_portals() {
 
 	case $NETWORK in
 	elan)  do_insmod $PORTALS/linux/rqswnal/kqswnal.o || exit -1
+                MYNID=
 		    ;;
 	tcp)   do_insmod $PORTALS/linux/socknal/ksocknal.o || exit -1
+                MYNID="mynid $LOCALHOST"
 		   ;;
 	*) 	fail "$0: unknown NETWORK '$NETWORK'" ;;
 	esac
@@ -226,7 +228,7 @@ setup_portals() {
 
 	$PTLCTL <<- EOF
 	network $NETWORK
-	mynid $LOCALHOST
+	$MYNID
 	connect $MDSNODE $PORT
 	add_uuid $MDSNODE $MDSNODE
 	connect $OSTNODE $PORT
@@ -539,7 +541,7 @@ cleanup_portals() {
 	do_rmmod ptlrpc
 	do_rmmod obdclass
 
-	#do_rmmod kqswnal
+	do_rmmod kqswnal
 	do_rmmod ksocknal
 	do_rmmod kptlrouter
 
-- 
1.8.3.1