X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=c5bbd8d153295e491a1dbc2ed5b19198c784e6d1;hb=772dcc6b13691e3ae1dc5923f6dcdcebe1da3edf;hp=5f548f523b9efa6f9e67de7408bb56f4715a4400;hpb=a04bc2220ab72a79a4fb82427a67809390db4f24;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index 5f548f5..c5bbd8d 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -183,14 +183,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 +325,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