X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=be80cd62ab28eba0a308597401bdaa4e8bcc744d;hb=69521ba0387941fc942ac6f24a32b7e40c68ff60;hp=0780e8b0914aea828185ebb1b58641a63f645ddb;hpb=11eeed78779bdb435625ef92a633b3140cb5b856;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index 0780e8b..be80cd6 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -208,11 +208,24 @@ cd "${OUTDIR}" || exit 1
   exectest x86info  && x86info > x86info 2>x86info.2
   exectest lscpu    && lscpu > lscpu
 
-  # net stuff
-  exectest ifconfig  && ifconfig -v -a  > ifconfig
-  exectest ip        && ip route show   > ip_route
-  exectest ip        && ip link show    > ip_link
-  exectest route     && route -n        > route
+  # net stuff, net-tools:
+  exectest ifconfig && ifconfig -v -a > ifconfig
+  exectest route    && route -n       > route
+
+  # net stuff, iproute:
+  exectest ip && ip addrlabel list > ip_addrlabel
+  exectest ip && ip addr show      > ip_addr
+  exectest ip && ip link show      > ip_link
+  exectest ip && ip maddr show     > ip_maddr
+  exectest ip && ip mroute show    > ip_mroute
+  exectest ip && ip mrule show     > ip_mrule
+  exectest ip && ip neigh show     > ip_neigh
+  exectest ip && ip netns list     > ip_netns
+  exectest ip && ip ntable show    > ip_ntable
+  exectest ip && ip route show     > ip_route
+  exectest ip && ip rule show      > ip_rule
+  exectest ip && ip tunnel show    > ip_tunnel
+  exectest ip && ip tuntap show    > ip_tuntap
 
   # software
   if exectest dpkg ; then
@@ -222,7 +235,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
 
@@ -336,6 +352,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