X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=973217711a945c6a7306e4fe04f1405ed2ceace7;hb=0cb80d4eb900173242e98df571a16c665a14d2fe;hp=5f548f523b9efa6f9e67de7408bb56f4715a4400;hpb=a04bc2220ab72a79a4fb82427a67809390db4f24;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index 5f548f5..9732177 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -33,12 +33,11 @@ _opt_output_file=false
 
 usage() {
   echo "
-  This tool collects information of the hardware this tool is being executed
-  on.  It can be executed as normal user to collect some basic information or
-  with root permissions to collect as much information as possible.  By
-  default, a file named grml-hwinfo-TIMESTAMP.tar.bz2 storing all collected
-  information will be created in the current working directory. Alternatively,
-  you can have it create a directory with all information.
+  This tool collects information of the hardware it is being executed on.
+  It can be executed as normal user to collect some basic information or
+  (recommended) with root permissions to collect more system information.
+  If executed without any options a file named grml-hwinfo-TIMESTAMP.tar.bz2
+  storing all collected information is created in the current working directory.
 
   Options:
 
@@ -183,14 +182,12 @@ cd "${OUTDIR}" || exit 1
 
   # disks / devices
   [ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi > scsi
-  (lspci; lspci -n) | sort > lspci
-  [ -r /proc/bus/pnp ] && lspnp > lspnp
-  [ -r /proc/bus/usb ] && lsusb > lsusb
+  exectest lspci && lspci -nn > lspci
   cat /proc/partitions > partitions
   find /proc/ide/ -name geometry -exec grep . {} \; > proc_ide 2>/dev/null
   df -h > df 2>/dev/null
-  for i in free lsmod mount lsdev ; do
-    exectest $i  && $i > $i
+  for i in free lsmod mount lsdev lspnp lsusb ; do
+    exectest $i && $i > $i
   done
   swapon -s > swapon 2>swapon.error
 
@@ -327,7 +324,7 @@ cd "${OUTDIR}" || exit 1
 )
 
 # get rid of empty files
-for file in *; do
+for file in *.error ; do
   test -s $file || rm $file
 done