X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fllmountcleanup.sh;h=454ed6eecc801b68a7f2b599a94e6a8968ad7324;hp=aa8f8b192a75da6bb5f5a519312f06c6e6166f4b;hb=2b905746ee3b5d9dbafcdb1af5930aea18120a7b;hpb=f45f09d9077c660925fb422f101d2025ee3f9f11

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index aa8f8b1..454ed6e 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,60 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
 
-umount /mnt/lustre
-
-killall acceptor
-rmmod llite
-rmmod mdc
-
-$OBDCTL <<EOF
-device 5
-cleanup
-detach
-device 4
-cleanup
-detach
-device 3
-cleanup
-detach
-device 2
-cleanup
-detach
-device 1
-cleanup
-detach
-device 0
-cleanup
-detach
-quit
-EOF
-
-rmmod obdecho
-rmmod mds
-rmmod osc
-rmmod ost
-rmmod obdfilter
-rmmod obdext2
-rmmod ldlm
-rmmod ptlrpc
-rmmod obdclass
-
-$PTLCTL <<EOF
-setup tcp
-disconnect
-del_uuid self
-del_uuid mds
-del_uuid ost
-del_uuid ldlm
-quit
-EOF
-
-rmmod kqswnal
-rmmod ksocknal
-rmmod portals
-
-losetup -d ${LOOP}0
-losetup -d ${LOOP}1
-losetup -d ${LOOP}2
+cleanupall -f