X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=8af9f8d515f753124383b17f59bdaddb2e957fde;hb=ad6d7c7d7a0d435e1ab54a98abc1b1fcb51ef9e3;hp=e883cc570fff74c5d9632e7e3250ed03507192c7;hpb=2c2398af765c648afffa2dc159ebbf771bcf54d5;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index e883cc5..8af9f8d 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -194,21 +194,32 @@ cd "${OUTDIR}" || exit 1
   # disks / devices
   [ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi > scsi
   exectest lspci && lspci -nn > ./lspci
+  exectest lspci && lspci -vvnn > ./lspci_verbose
   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 lspnp lsusb ; do
+  for i in free lsmod mount lsdev lspnp ; do
     exectest $i && $i > ./$i
   done
+
+  if exectest lsusb ; then
+    lsusb    > ./lsusb
+    lsusb -v > ./lsusb_verbose 2>./lsusb_verbose.error
+  fi
+
   swapon -s > ./swapon 2>./swapon.error
 
   # proc stuff
   for i in cpuinfo interrupts cmdline devices dma fb iomem ioports \
-    mdstat meminfo modules mtrr pci version ; do
+    mdstat meminfo modules mtrr pci uptime version ; do
     [ -r /proc/$i ] && cat /proc/$i > proc_$i
   done
   exectest sysdump  && sysdump > ./sysdump 2>./sysdump.error
 
+  exectest cpuid && cpuid > ./cpuid 2>./cpuid.error
+
+  exectest uptime && uptime > ./uptime 2>./uptime.error
+
   # log
   dmesg > dmesg.cur
 
@@ -218,6 +229,7 @@ cd "${OUTDIR}" || exit 1
   exectest numactl  && numactl --hardware > ./numactl
   exectest x86info  && x86info > ./x86info 2>./x86info.error
   exectest lscpu    && lscpu > ./lscpu
+  exectest lscpu    && lscpu -e > ./lscpu_extended
 
   # EFI
   exectest efibootmgr && efibootmgr -v > efibootmgr
@@ -293,6 +305,10 @@ cd "${OUTDIR}" || exit 1
     cp /var/log/$i log_$i 2>/dev/null
   done
 
+  if [ -r "$HOME"/.local/share/xorg/Xorg.0.log ] ; then
+    cp "$HOME"/.local/share/xorg/Xorg.0.log user_Xorg.0.log
+  fi
+
   cp /etc/X11/xorg.conf    xorg.conf    2>/dev/null
   cp /etc/modules          modules      2>/dev/null
   cp /etc/X11/XF86Config-4 XF86Config-4 2>/dev/null
@@ -327,6 +343,10 @@ cd "${OUTDIR}" || exit 1
       acpidump > ./acpidump 2>./acpidump.error
     fi
 
+    if exectest mokutil ; then
+      mokutil --sb-state > ./mokutil_state 2>./mokutil_state.error
+    fi
+
     # proxmox
     exectest qm && qm list > ./qm 2>./qm.error
     # libvirt