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

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

	* stp_check.in: More tweaking of mount statement.
---

diff --git a/ChangeLog b/ChangeLog
index 0fd1b4a7d..3acc80678 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-24  Martin Hunt  <hunt@redhat.com>
+
+	* stp_check.in: More tweaking of mount statement.
+
 2007-04-23  Frank Ch. Eigler  <fche@redhat.com>
 
 	* tapsets.cxx (die_entrypc): Expand search algorithm to
diff --git a/stp_check.in b/stp_check.in
index c5adf4e54..5858ac55b 100755
--- a/stp_check.in
+++ b/stp_check.in
@@ -8,13 +8,13 @@ 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 "/sys/kernel/debug" |awk '{print $1}'`
-	if [ "$MOUNT" != "debugfs" ]
+	MOUNT=`mount -t debugfs | grep "/sys/kernel/debug"`
+	if [ "$MOUNT" == "" ]
 	then
 		mount -t debugfs debugfs /sys/kernel/debug
 	fi
-	MOUNT=`mount | grep "/sys/kernel/debug" |awk '{print $1}'`
-	if [ "$MOUNT" != "debugfs" ]
+	MOUNT=`mount -t debugfs | grep "/sys/kernel/debug"`
+	if [ "$MOUNT" == "" ]
 	then
 		exit 1
 	fi
@@ -26,8 +26,8 @@ then
     mkdir /mnt/relay
 fi
 
-MOUNT=`mount | grep "/mnt/relay" |awk '{print $1}'`
-if [ "$MOUNT" != "relayfs" ]
+MOUNT=`mount -t relayfs | grep "/mnt/relay"`
+if [ "$MOUNT" == "" ]
 then
 	mount -t relayfs relayfs /mnt/relay
 fi