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

	* stp_check.in: More tweaking of mount statement.

diff --git a/ChangeLog b/ChangeLog
index 0fd1b4a7de3c6987203a565d61494181e1a9901c..3acc80678c8b232e74417713aa6c4cd6bd6a2a91 100644 (file)
--- 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 c5adf4e54a0927f40609c6c6dac7d6889dea6a22..5858ac55b7a7704055ddc4c640b9c6db9bc01d39 100755 (executable)
--- 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