diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | handlers/sys.in | 24 |
2 files changed, 16 insertions, 10 deletions
@@ -5,6 +5,8 @@ version 1.0 -- UNRELEASED (Closes: #673572) backupninja changes . Make it clear what lockfile could not be acquired, if any. + sys: + . Don't execute /usr/bin/lspci or /sbin/modinfo when $hardware == "no" version 1.0-rc1 -- May 15, 2012 handler changes diff --git a/handlers/sys.in b/handlers/sys.in index 74133a3..92998cc 100644 --- a/handlers/sys.in +++ b/handlers/sys.in @@ -348,13 +348,15 @@ echo "Getting information about the kernel." echo STATUS="Getting kernel version:" catifexec "/bin/uname" "-a" -STATUS="Checking module information:" -catifexec "/sbin/lsmod" -for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null -) ; do - STATUS="Checking module information $x:" - catifexec "/sbin/modinfo" "$x" -done +if [ "$hardware" == "yes" ]; then + STATUS="Checking module information:" + catifexec "/sbin/lsmod" + for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null + ) ; do + STATUS="Checking module information $x:" + catifexec "/sbin/modinfo" "$x" + done +fi STATUS="Gathering information about your filesystems:" catiffile "/proc/filesystems" @@ -432,9 +434,11 @@ catiffile "/proc/rtc" STATUS="Gathering information about your ide drivers:" catiffile "/proc/ide" -STATUS="Gathering information about your bus:" -catifexec "/usr/bin/lspci" -catiffile "/proc/bus" +if [ "$hardware" == "yes" ]; then + STATUS="Gathering information about your bus:" + catifexec "/usr/bin/lspci" + catiffile "/proc/bus" +fi echo echo "Getting disk and filesystem information." |