X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=c8d299fd5f5b7bd43e8fb2685deb12dfda0ccb62;hb=13106d02bea3d00656c113d40509283aee7df1ee;hp=382594f50299853f8b45596bdfd719eb8184d115;hpb=d77edf4830c5e33b0fa1db808e11e13de135e6fc;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index 382594f..c8d299f 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -214,7 +214,18 @@ cd "${OUTDIR}" || exit 1
     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
 
@@ -227,9 +238,10 @@ 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
+  exectest efibootmgr && efibootmgr -v >efibootmgr 2>efibootmgr.error
 
   # net stuff, net-tools:
   exectest ifconfig && ifconfig -v -a > ./ifconfig
@@ -243,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
@@ -316,7 +329,7 @@ cd "${OUTDIR}" || exit 1
   else
     echo "running as root" > root
     disk_info
-    exectest sfdisk     && sfdisk -d > ./sfdisk 2>./sfdisk.error
+
     exectest dmidecode  && dmidecode > ./dmidecode
 
     exectest dconf && dconf -o dconf
@@ -381,6 +394,10 @@ cd "${OUTDIR}" || exit 1
     fi
 
     for disk in $disklist; do
+      if exectest sfdisk && [[ -b "/dev/${disk}" ]] ; then
+        sfdisk -d "/dev/${disk}" > "./sfdisk_${disk}" 2>"./sfdisk_${disk}.error"
+      fi
+
       if exectest smartctl ; then
         echo -e "smartctl -a /dev/${disk}:\n" >> smartctl
         smartctl -a "/dev/$disk" >> ./smartctl