From 0110f903329ab531bcbe9d555d5b6f6dc77d8a54 Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Tue, 9 Aug 2005 19:19:51 +0000
Subject: [PATCH] 2005-08-09  Martin Hunt  <hunt@redhat.com>

	PR 1174
	* stp_check.in: Supply path for lsmod.
	* stp_check: Removed.
---
 ChangeLog    |  6 +++++
 stp_check    | 69 ----------------------------------------------------
 stp_check.in |  4 +--
 3 files changed, 8 insertions(+), 71 deletions(-)
 delete mode 100644 stp_check

diff --git a/ChangeLog b/ChangeLog
index ef39160d5..196ce6450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-09  Martin Hunt  <hunt@redhat.com>
+
+	PR 1174
+	* stp_check.in: Supply path for lsmod. 
+	* stp_check: Removed.
+
 2005-08-09  Graydon Hoare  <graydon@redhat.com>
 
 	* elaborate.cxx: 
diff --git a/stp_check b/stp_check
deleted file mode 100644
index 8610d3ee4..000000000
--- a/stp_check
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-load_module()
-{
-    ret=1
-    if [ -e "$MODULE" ]
-    then
-	/sbin/insmod $MODULE
-	ret=$?
-    fi
-	
-    if [ "$ret" -ne 0 ]
-    then
-	echo "$MODULE_NAME not in kernel and not built.  Compiling..."
-	mkdir -p $MODULE_DIR
-	cp -dpr $SRC_DIR/* $MODULE_DIR
-	make -w -C $MODULE_DIR
-	if [ "$?" -ne 0 ]
-	then
-	    echo "Failed to load module $MODULE_NAME."
-	    exit $?
-	fi
-
-	/sbin/insmod $MODULE
-	if [ "$?" -ne 0 ]
-	then
-	    echo "Failed to load module $MODULE_NAME."
-	    exit $?
-	fi
-    fi
-}
-
-VAR_DIR=${prefix}/var/cache/systemtap
-
-RELAYFS=`grep " relayfs_poll" /boot/System.map-\`uname -r\``
-if [ -z "$RELAYFS" ]
-then
-    RELAYFS=`lsmod | grep relayfs`
-    if [ -z "$RELAYFS" ]
-    then
-	MODULE_NAME=relayfs
-	MODULE_DIR=$VAR_DIR/relayfs
-	MODULE=$MODULE_DIR/relayfs.ko
-	SRC_DIR=${prefix}/share/systemtap/runtime/relayfs
-	load_module
-    fi
-fi
-
-if [ ! -d "/mnt/relay" ]
-then
-    mkdir /mnt/relay
-fi
-
-MOUNT=`mount | grep relayfs |awk '{print $1}'`
-if [ "$MOUNT" != "relayfs" ]
-then
-	mount -t relayfs relayfs /mnt/relay
-fi
-
-STP_CONTROL=`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=${prefix}/share/systemtap/runtime/transport
-    load_module
-fi
-
diff --git a/stp_check.in b/stp_check.in
index 78aabebf0..92ef4fed5 100755
--- a/stp_check.in
+++ b/stp_check.in
@@ -36,7 +36,7 @@ VAR_DIR=@localstatedir@/cache/systemtap
 RELAYFS=`grep " relayfs_poll" /boot/System.map-\`uname -r\``
 if [ -z "$RELAYFS" ]
 then
-    RELAYFS=`lsmod | grep relayfs`
+    RELAYFS=`/sbin/lsmod | grep relayfs`
     if [ -z "$RELAYFS" ]
     then
 	MODULE_NAME=relayfs
@@ -58,7 +58,7 @@ then
 	mount -t relayfs relayfs /mnt/relay
 fi
 
-STP_CONTROL=`lsmod | grep stp_control |awk '{print $1}'`
+STP_CONTROL=`/sbin/lsmod | grep stp_control |awk '{print $1}'`
 if [ "$STP_CONTROL" != "stp_control" ] 
 then
     MODULE_NAME=stp-control
-- 
2.43.5