use debugctl for 'modules'

unload 'obdecho'

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index bbe0179..6e37f6d 100644 (file)
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -16,7 +16,7 @@ insmod $R/usr/src/obd/ost/ost.o || exit -1
 insmod $R/usr/src/obd/osc/osc.o || exit -1
 insmod $R/usr/src/obd/obdecho/obdecho.o || exit -1
 
-$R/usr/src/obd/utils/obdctl modules > $R/tmp/ogdb
+$R/usr/src/portals/linux/utils/debugctl modules > $R/tmp/ogdb
 echo "The GDB module script is in /tmp/ogdb.  Press enter to continue"
 read
 

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index c233741..0e78ebc 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -19,7 +19,7 @@ insmod $R/usr/src/obd/mds/mds.o || exit -1
 insmod $R/usr/src/obd/mdc/mdc.o || exit -1
 insmod $R/usr/src/obd/llight/llight.o || exit -1
 
-$R/usr/src/obd/utils/obdctl modules > $R/tmp/ogdb
+$R/usr/src/portals/linux/utils/debugctl modules > $R/tmp/ogdb
 echo "The GDB module script is in /tmp/ogdb.  Press enter to continue"
 read
 

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 548098b..f03c5e4 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -24,6 +24,7 @@ detach
 quit
 EOF
 
+rmmod obdecho
 rmmod mds
 rmmod osc
 rmmod ost

diff --git a/lustre/tests/ostreq.sh b/lustre/tests/ostreq.sh
index ab26b7c..3d9d6c2 100644 (file)
--- a/lustre/tests/ostreq.sh
+++ b/lustre/tests/ostreq.sh
@@ -37,7 +37,7 @@ 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/portals/linux/utils/debugctl modules > $R/tmp/ogdb
 
 $R/usr/src/obd/utils/obdctl <<EOF
 device 0