X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=ab2b295e45ba09ca3fe136ba737383be03719a50;hb=42ab70c32a767273425f2f4c95076e31d3f94eed;hp=a5374f3da780351dbccc8e814e5daa9755b7dd2a;hpb=3bece2298853b484adae02d5433c11cfc3269478;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index a5374f3..ab2b295 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -211,10 +211,23 @@ cd "${OUTDIR}" || exit 1
 
   # 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
+
+  if ! $_opt_quiet ; then
+    echo "Starting sysdump..."
+    echo "  NOTE: if it seems to be hanging at this stage file a bug report with output of:"
+    echo "        lsof -p \$(pgrep -f "\$\(which sysdump\)")"
+  fi
   exectest sysdump  && sysdump > ./sysdump 2>./sysdump.error
+  if ! $_opt_quiet ; then
+    echo "Execution of sysdump finished."
+  fi
+
+  exectest cpuid && cpuid > ./cpuid 2>./cpuid.error
+
+  exectest uptime && uptime > ./uptime 2>./uptime.error
 
   # log
   dmesg > dmesg.cur
@@ -225,6 +238,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
@@ -241,12 +255,13 @@ cd "${OUTDIR}" || exit 1
   exectest ip && ip mroute show    > ip_mroute
   exectest ip && ip mrule show     > ip_mrule 2>ip_mrule.error
   exectest ip && ip neigh show     > ip_neigh
+  exectest ip && ip netconf        > ip_netconf
   exectest ip && ip netns list     > ip_netns
   exectest ip && ip ntable show    > ip_ntable
   exectest ip && ip route show     > ip_route
   exectest ip && if [ -r /etc/iproute2/rt_tables ] ; then
                    grep -v '^#' /etc/iproute2/rt_tables | while read table _ ; do
-                     ip route show table "${table}" > "ip_route_table_${table}"
+                     ip route show table "${table}" > "ip_route_table_${table}" 2> "ip_route_table_${table}".error
                    done
                  fi
   exectest ip && ip rule show      > ip_rule
@@ -300,6 +315,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
@@ -334,6 +353,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