Improve local disk detection for recent kernel changes

Based on https://github.com/faiproject/fai/blob/master/lib/fai-disk-info

diff --git a/grml-hwinfo b/grml-hwinfo
index 406f9b7..1b572f4 100755 (executable)
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -150,36 +150,20 @@ exectest() {
   fi
 }
 
-# echo a list of all disks and their size
-# taken from http://cvs.debian.org/fai/lib/disk-info
-diskandsize() {
-  local isdisk major minor blocks device suffix
-  while read _ _ blocks device _ ; do
+# based on https://github.com/faiproject/fai/blob/master/lib/fai-disk-info
+checkdisk() {
+  local isdisk device
+  while read _ _ _ device _ ; do
     isdisk=1
-    # skip ide cdrom
-    [ -f "/proc/ide/${device}/media" ] && grep -q cdrom "/proc/ide/${device}/media" && isdisk=0
-    [ "$isdisk" -eq 1 ] && echo "$device $blocks"
-  done
-}
-
-list_disks() {
-  # print only every second entry; used by disk_info
-  i=0
-  for ent in "$@" ; do
-    if [ "$i" -eq 0 ]; then
-      echo "$ent"
-      i=1
-    else
-      i=0
-    fi
+    # skip CDROMs
+    [ "$(stat -c %G /dev/$device)" = "disk" ] || isdisk=0
+    [ "$isdisk" -eq 1 ] && echo "$device"
   done
 }
 
 disk_info() {
-  # the variable holds a space separated list of devices and their block size
-  device_size=$(grep -E ' cciss/c.d.$| ida/c.d.$| rd/c.d.$| hd.$| sd.$|/disc$' /proc/partitions | diskandsize)
-  # a list of all local disks, without size
-  disklist=$(list_disks "$device_size")
+  # the variable holds a newline separated list of devices
+  disklist=$(egrep ' etherd/e[[:digit:]]+\.[[:digit:]]+\b| i2o/hd.+\b| cciss/c.+d.+\b| ida/c.+d.+\b| rd/c.+d.+\b| fio.\b| hd.\b| sd[a-z]{1,2}\b|/disc\b| vd.\b| xvd.\b' /proc/partitions | checkdisk)
 }