X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=7884e4b196ce5e48d1b336a334f21c0b27114552;hb=f89b5536c8d3b17a0c832e4a2a8f9732144eede8;hp=764352376f5a21fa421965b68b23dee64645f2d5;hpb=211ace9d14bc263087f1e2b8a11b95229888954b;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index 7643523..7884e4b 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -206,6 +206,7 @@ cd "${OUTDIR}" || exit 1
   exectest hwinfo   && hwinfo log=hwinfo
   exectest numactl  && numactl --hardware > numactl
   exectest x86info  && x86info > x86info 2>x86info.2
+  exectest lscpu    && lscpu > lscpu
 
   # net stuff
   exectest ifconfig  && ifconfig -v -a  > ifconfig
@@ -221,7 +222,10 @@ cd "${OUTDIR}" || exit 1
 
   # power management
   exectest laptop-detect  && laptop-detect >/dev/null 2>/dev/null && echo "0" > laptop_detected
-  exectest acpi_available && acpi_available && cat /proc/acpi/info > acpi_info
+  if [ -r /proc/acpi/info ] ; then
+    cat /proc/acpi/info > acpi_info
+  fi
+
   exectest acpi && acpi > acpi 2> acpi.error && acpi -v > acpi.version
   [ -r /proc/apm/ ] && apm > apm
 
@@ -286,6 +290,8 @@ cd "${OUTDIR}" || exit 1
     exectest lvdisplay && lvdisplay > lvdisplay 2>lvdisplay.error
 
     exectest dmsetup && dmsetup ls > dmsetup_ls 2>dmsetup_ls.error
+    exectest dmsetup && dmsetup ls --tree > dmsetup_ls_tree 2>dmsetup_ls_tree.error
+    exectest lsblk && lsblk > lsblk 2>lsblk.error
 
     # iSCSI
     if exectest iscsiadm ; then
@@ -297,7 +303,10 @@ cd "${OUTDIR}" || exit 1
       iscsiadm -m discovery > iscsiadm_discovery 2>iscsiadm_discovery.error
     fi
 
-    exectest lsscsi && lsscsi > lsscsi 2>lsscsi.error
+    if exectest lsscsi ; then
+      lsscsi    > lsscsi 2>lsscsi.error
+      lsscsi -t > lsscsi_transport 2>lsscsi_transport.error
+    fi
 
     for disk in $disklist; do
       if exectest smartctl ; then
@@ -330,6 +339,12 @@ cd "${OUTDIR}" || exit 1
         echo -e "\n\n" >> sdparm
       fi
 
+      if exectest sg_inq ; then
+        echo -e "sg_inq /dev/${disk}:\n" >> sg_inq
+        sg_inq /dev/$disk >> sg_inq
+        echo -e "\n\n" >> sg_inq
+      fi
+
       file -s /dev/$disk?* | grep -v ": empty" >> file_disk
     done
   fi