Skip to content
Snippets Groups Projects
Commit 1eabbe5d authored by micah's avatar micah :speech_balloon:
Browse files

dont run lspci and modinfo when hwinfo==no

parent f8e69f73
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,8 @@ version 1.0 -- UNRELEASED ...@@ -5,6 +5,8 @@ version 1.0 -- UNRELEASED
(Closes: #673572) (Closes: #673572)
backupninja changes backupninja changes
. Make it clear what lockfile could not be acquired, if any. . 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 version 1.0-rc1 -- May 15, 2012
handler changes handler changes
......
...@@ -348,6 +348,7 @@ echo "Getting information about the kernel." ...@@ -348,6 +348,7 @@ echo "Getting information about the kernel."
echo echo
STATUS="Getting kernel version:" STATUS="Getting kernel version:"
catifexec "/bin/uname" "-a" catifexec "/bin/uname" "-a"
if [ "$hardware" == "yes" ]; then
STATUS="Checking module information:" STATUS="Checking module information:"
catifexec "/sbin/lsmod" catifexec "/sbin/lsmod"
for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null
...@@ -355,6 +356,7 @@ for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Modu ...@@ -355,6 +356,7 @@ for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Modu
STATUS="Checking module information $x:" STATUS="Checking module information $x:"
catifexec "/sbin/modinfo" "$x" catifexec "/sbin/modinfo" "$x"
done done
fi
STATUS="Gathering information about your filesystems:" STATUS="Gathering information about your filesystems:"
catiffile "/proc/filesystems" catiffile "/proc/filesystems"
...@@ -432,9 +434,11 @@ catiffile "/proc/rtc" ...@@ -432,9 +434,11 @@ catiffile "/proc/rtc"
STATUS="Gathering information about your ide drivers:" STATUS="Gathering information about your ide drivers:"
catiffile "/proc/ide" catiffile "/proc/ide"
if [ "$hardware" == "yes" ]; then
STATUS="Gathering information about your bus:" STATUS="Gathering information about your bus:"
catifexec "/usr/bin/lspci" catifexec "/usr/bin/lspci"
catiffile "/proc/bus" catiffile "/proc/bus"
fi
echo echo
echo "Getting disk and filesystem information." echo "Getting disk and filesystem information."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment