Fix ltt-armall/disarmall /debugfs auto-find

[ltt-control.git] / lttctl / ltt-armall.sh

diff --git a/lttctl/ltt-armall.sh b/lttctl/ltt-armall.sh
index 9b740d1cfd9b0e7dc85112f79000a8ae18ccccbc..1b1c3f9598f8470276c9e08e60ff2d42cf906e76 100755 (executable)
--- a/lttctl/ltt-armall.sh
+++ b/lttctl/ltt-armall.sh
@@ -1,4 +1,5 @@
 # Copyright (C) 2009 Benjamin Poirier
+# Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,7 +15,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-DEBUGFSROOT=$(grep ^debugfs /proc/mounts | head -n 1 | awk '{print $2}')
+DEBUGFSROOT=$(awk '{if ($3 == "debugfs") print $2}' /proc/mounts | head -n 1)
 MARKERSROOT=${DEBUGFSROOT}/ltt/markers
 
 usage () {
@@ -24,6 +25,7 @@ usage () {
        echo "Options:" > /dev/stderr
        printf "\t-l           Also activate locking markers (high traffic)\n" > /dev/stderr
        printf "\t-n           Also activate detailed network markers (large size)\n" > /dev/stderr
+       printf "\t-i           Also activate input subsystem events (security implication: records keyboard inputs)\n" > /dev/stderr
        echo "" > /dev/stderr
        printf "\t-q           Quiet mode, suppress output\n" > /dev/stderr
        printf "\t-h           Print this help\n" > /dev/stderr
@@ -45,6 +47,7 @@ while getopts "lnqh" options; do
                l) LOCKING="0";;
                n) NETWORK="0";;
                q) QUIET="0";;
+               i) INPUT="0";;
                h) usage;
                        exit 0;;
                \?) usage;
@@ -62,7 +65,11 @@ if [ ! ${NETWORK} ]; then
        TESTS="${TESTS} -path '*/net/*_extended' -prune -o"
 fi
 
-(eval "find '${MARKERSROOT}' ${TESTS} -name metadata -prune -o -name enable -print0") | while read -r -d $'\0' marker; do
+if [ ! ${INPUT} ]; then
+       TESTS="${TESTS} -name input -prune -o"
+fi
+
+(eval "find '${MARKERSROOT}' ${TESTS} -name metadata -prune -o -name enable -print") | while read -r marker; do
        if [ ! ${QUIET} ]; then
                echo "Connecting ${marker%/enable}"
        fi