2005-08-19 Martin Hunt <hunt@redhat.com>

	* stp_check.in: Remove stp-control.

diff --git a/ChangeLog b/ChangeLog
index ccd70407903f3d0dc40df02f8a6e40e46b28cedd..f0bccf5edfaec7d52eccf6dbcad15d4dd947d906 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-19  Martin Hunt  <hunt@redhat.com>
+
+       * stp_check.in: Remove stp-control.
+
 2005-08-18  Roland McGrath  <roland@redhat.com>
 
        * loc2c.c (c_translate_addressof): Take TYPEDIE instead of TYPEATTR.

diff --git a/stp_check.in b/stp_check.in
index a8d7c1cec4d2e8f4981a5103691ee675bd8e1d03..defc0a6230f35f9b5fdb42b2efd03bc74a2dbfc7 100755 (executable)
--- a/stp_check.in
+++ b/stp_check.in
@@ -33,18 +33,14 @@ load_module()
 prefix=@prefix@
 VAR_DIR=@localstatedir@/cache/systemtap
 
-RELAYFS=`grep "relayfs" /proc/filesystems`
+RELAYFS=`grep relayfs /proc/filesystems`
 if [ -z "$RELAYFS" ]
 then
-    RELAYFS=`/sbin/lsmod | grep relayfs`
-    if [ -z "$RELAYFS" ]
-    then
        MODULE_NAME=relayfs
        MODULE_DIR=$VAR_DIR/relayfs
        MODULE=$MODULE_DIR/relayfs.ko
        SRC_DIR=@datadir@/systemtap/runtime/relayfs
        load_module
-    fi
 fi
 
 if [ ! -d "/mnt/relay" ]
@@ -58,13 +54,3 @@ then
        mount -t relayfs relayfs /mnt/relay
 fi
 
-STP_CONTROL=`/sbin/lsmod | grep stp_control |awk '{print $1}'`
-if [ "$STP_CONTROL" != "stp_control" ] 
-then
-    MODULE_NAME=stp-control
-    MODULE_DIR=$VAR_DIR/transport
-    MODULE=$MODULE_DIR/stp-control.ko
-    SRC_DIR=@datadir@/systemtap/runtime/transport
-    load_module
-fi
-