From 932054771a4979cf35f22da140b6156d099501c2 Mon Sep 17 00:00:00 2001
From: pschwan <pschwan>
Date: Thu, 8 Aug 2002 08:30:28 +0000
Subject: [PATCH] - More lctl-related common.sh fixes - It's a little late to
 be fixing llmountcleanup, but I did it anyways

---
 lustre/tests/common.sh         | 10 +++---
 lustre/tests/llcleanup.sh      |  3 --
 lustre/tests/llmountcleanup.sh | 76 +-----------------------------------------
 3 files changed, 7 insertions(+), 82 deletions(-)

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index 56fb23f..02ae617 100644
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -10,8 +10,8 @@ if [ -f $SRCDIR/Makefile.am ]; then
 	PORTALS=$SRCDIR/../../portals
 	LUSTRE=$SRCDIR/..
 
-	PTLCTL=$PORTALS/linux/utils/ptlctl
-	DBGCTL=$PORTALS/linux/utils/debugctl
+	PTLCTL=$LUSTRE/utils/lctl
+	DBGCTL=$LUSTRE/utils/lctl
 	ACCEPTOR=$PORTALS/linux/utils/acceptor
 
 	OBDCTL=$LUSTRE/utils/lctl
@@ -465,7 +465,7 @@ setup_lov () {
 	$OBDCTL <<- EOF || return $?
 	newdev
 	attach lov LOVNAME  ${LOVUUID}
-	setup  MDCDEV-UUID
+	setup MDCDEV-UUID
 	quit
 	EOF
 }        
@@ -526,7 +526,7 @@ cleanup_portals() {
 	setup_variables
 
 	$PTLCTL <<- EOF
-	setup $NETWORK
+	network $NETWORK
 	disconnect
 	del_uuid self
 	del_uuid $MDSNODE
@@ -543,6 +543,8 @@ cleanup_portals() {
 	do_rmmod ksocknal
 	do_rmmod kptlrouter
 
+        [ -z "$TIME" ] || $DBGCTL debug_kernel /tmp/debug.3.$TIME
+
 	do_rmmod portals
 }
 
diff --git a/lustre/tests/llcleanup.sh b/lustre/tests/llcleanup.sh
index 0141c53..b718e93 100755
--- a/lustre/tests/llcleanup.sh
+++ b/lustre/tests/llcleanup.sh
@@ -14,9 +14,6 @@ cleanup_client
 $DBGCTL debug_kernel /tmp/debug.2.$TIME
 cleanup_server
 
-$DBGCTL debug_kernel /tmp/debug.3.$TIME
 cleanup_ldlm
-$DBGCTL debug_kernel /tmp/debug.4.$TIME
 cleanup_lustre
-$DBGCTL debug_kernel /tmp/debug.5.$TIME
 cleanup_portals
diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 298d01d..6b861a4 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -3,78 +3,4 @@
 SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-TIME=`date +'%s'`
-
-$DBGCTL debug_kernel /tmp/debug.1.$TIME 1
-
-if mount | grep '/mnt/lustre'; then
-	umount /mnt/lustre || fail "cannot unmount"
-fi
-
-killall acceptor
-rmmod llite
-
-$OBDCTL <<EOF
-name2dev MDCDEV
-cleanup
-detach
-name2dev OSCDEV
-cleanup
-detach
-name2dev OSTDEV
-cleanup
-detach
-name2dev OBDDEV
-cleanup
-detach
-name2dev MDSDEV
-cleanup
-detach
-name2dev LDLMDEV
-cleanup
-detach
-name2dev RPCDEV
-cleanup
-detach
-quit
-EOF
-
-rmmod lov
-rmmod obdecho
-rmmod mds_extN
-rmmod mds_ext3
-rmmod mds_ext2
-rmmod mds
-rmmod mdc
-rmmod osc
-rmmod ost
-rmmod obdfilter
-rmmod obdext2
-rmmod ldlm
-rmmod ptlrpc
-rmmod obdclass
-rmmod extN
-
-$DBGCTL debug_kernel /tmp/debug.2.$TIME 1
-
-$PTLCTL <<EOF
-setup tcp
-disconnect
-del_uuid self
-del_uuid localhost
-del_uuid localhost
-del_uuid localhost
-quit
-EOF
-
-rmmod kqswnal
-rmmod ksocknal
-
-$DBGCTL debug_kernel /tmp/debug.3.$TIME 1
-
-rmmod portals
-
-losetup -d ${LOOP}0
-losetup -d ${LOOP}1
-losetup -d ${LOOP}2
-exit 0
+. $SRCDIR/llcleanup.sh $SRCDIR/net-local.cfg $SRCDIR/mds.cfg $SRCDIR/obdfilter.cfg $SRCDIR/client-mount.cfg $SRCDIR/ldlm.cfg || exit 2
\ No newline at end of file
-- 
1.8.3.1