summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2007-04-24 13:32:19 +0000
committerhunt <hunt>2007-04-24 13:32:19 +0000
commita50cc2c401fc7e8ec084fe129aa420f42cbc78bd (patch)
tree609c95e0a246c1ac787b449e07b3377e12fcd3ac
parentfeebe90d304fcf7c159d23cf351b99796cbb63b4 (diff)
downloadsystemtap-steved-a50cc2c401fc7e8ec084fe129aa420f42cbc78bd.tar.gz
systemtap-steved-a50cc2c401fc7e8ec084fe129aa420f42cbc78bd.tar.xz
systemtap-steved-a50cc2c401fc7e8ec084fe129aa420f42cbc78bd.zip
2007-04-24 Martin Hunt <hunt@redhat.com>
* stp_check.in: More tweaking of mount statement.
-rw-r--r--ChangeLog4
-rwxr-xr-xstp_check.in12
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fd1b4a7..3acc8067 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 c5adf4e5..5858ac55 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