diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | stp_check.in | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -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 3f7fe0a8..c5adf4e5 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 |