From 7e0b6360fea6b00fb29273cf53b858f69af9b079 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 16 Aug 2012 10:22:06 +0200
Subject: [PATCH] Run lspci -nn for lspci output, do not check for /proc/bus/*
 for lspnp && lsusb commands but instead just run exectest

---
 grml-hwinfo | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/grml-hwinfo b/grml-hwinfo
index 5f548f5..c0c654c 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
 
-- 
2.1.4