X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=7884e4b196ce5e48d1b336a334f21c0b27114552;hb=3644e97fe736423c0d43402d385fc2619e94a1b9;hp=c0c654c3fd947be848fd778663f135f2b545a7d4;hpb=7e0b6360fea6b00fb29273cf53b858f69af9b079;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index c0c654c..7884e4b 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -33,12 +33,11 @@ _opt_output_file=false
 
 usage() {
   echo "
-  This tool collects information of the hardware this tool is being executed
-  on.  It can be executed as normal user to collect some basic information or
-  with root permissions to collect as much information as possible.  By
-  default, a file named grml-hwinfo-TIMESTAMP.tar.bz2 storing all collected
-  information will be created in the current working directory. Alternatively,
-  you can have it create a directory with all information.
+  This tool collects information of the hardware it is being executed on.
+  It can be executed as normal user to collect some basic information or
+  (recommended) with root permissions to collect more system information.
+  If executed without any options a file named grml-hwinfo-TIMESTAMP.tar.bz2
+  storing all collected information is created in the current working directory.
 
   Options:
 
@@ -207,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
@@ -222,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
 
@@ -287,6 +290,23 @@ 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
+      iscsiadm -m session > iscsiadm_session 2>iscsiadm_session.error
+      iscsiadm -m fw > iscsiadm_fw 2>iscsiadm_fw.error
+      iscsiadm -m host > iscsiadm_host 2>iscsiadm_host.error
+      iscsiadm -m iface > iscsiadm_iface 2>iscsiadm_iface.error
+      iscsiadm -m node > iscsiadm_node 2>iscsiadm_node.error
+      iscsiadm -m discovery > iscsiadm_discovery 2>iscsiadm_discovery.error
+    fi
+
+    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
@@ -319,13 +339,19 @@ 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
 )
 
 # get rid of empty files
-for file in *; do
+for file in *.error ; do
   test -s $file || rm $file
 done
 
@@ -335,7 +361,7 @@ cd "${WORKING_DIR}"
 
 # create tarball
 if [ -n "$GENERATE_FILE" ] ; then
-  tar jcf "${OUTFILE}" "${OUTDIRNAME}"
+  tar acf "${OUTFILE}" "${OUTDIRNAME}"
   [ -r "$OUTFILE" ] && echo "$OUTFILE ("$(ls -ahl "$OUTFILE" | awk '{print $5}')") has been generated."
 fi