From: hunt <hunt>
Date: Tue, 10 Apr 2007 13:28:51 +0000 (+0000)
Subject: 2007-04-10  Martin Hunt  <hunt@redhat.com>
X-Git-Tag: release-0.5.14~151
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3596cbca20e5ef0f110ffd342db6d0e4278e81ba;p=systemtap.git

2007-04-10  Martin Hunt  <hunt@redhat.com>

	* stp_check.in: Fixes to make sure debugfs or relayfs are mounted
	exactly where we expect and other mounts are ignored.
---

diff --git a/ChangeLog b/ChangeLog
index 886d35bb2..ff59f44b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-10  Martin Hunt  <hunt@redhat.com>
+
+	* stp_check.in: Fixes to make sure debugfs or relayfs are mounted
+	exactly where we expect and other mounts are ignored.
+
 2007-04-03  Pierre Peiffer  <pierre.peiffer@bull.net>
 
 	* parse.cxx, parse.h (lexer::scan): Add $# and @# identifiers.
diff --git a/stp_check.in b/stp_check.in
index 3f7fe0a8f..c5adf4e54 100755
--- a/stp_check.in
+++ b/stp_check.in
@@ -8,12 +8,12 @@ RELAYFS_FS=`grep relayfs_create_dir /proc/kallsyms`
 RELAY=`grep relay_open /proc/kallsyms`
 if [ -n "$RELAY" -a -z "$RELAYFS_FS" ]
 then
-	MOUNT=`mount | grep debugfs |awk '{print $1}'`
+	MOUNT=`mount | grep "/sys/kernel/debug" |awk '{print $1}'`
 	if [ "$MOUNT" != "debugfs" ]
 	then
 		mount -t debugfs debugfs /sys/kernel/debug
 	fi
-	MOUNT=`mount | grep debugfs |awk '{print $1}'`
+	MOUNT=`mount | grep "/sys/kernel/debug" |awk '{print $1}'`
 	if [ "$MOUNT" != "debugfs" ]
 	then
 		exit 1
@@ -26,7 +26,7 @@ then
     mkdir /mnt/relay
 fi
 
-MOUNT=`mount | grep relayfs |awk '{print $1}'`
+MOUNT=`mount | grep "/mnt/relay" |awk '{print $1}'`
 if [ "$MOUNT" != "relayfs" ]
 then
 	mount -t relayfs relayfs /mnt/relay