hdd: improve output

hdd/functions.sh

@@ -24,13 +24,25 @@ is_hdd()
 
 print_model()
 {
+    local dev="$1"
     hdparm -i $dev | grep "Model=" | sed -e "s|.*Model=\(.*\), F.*|\1|"
 }
 
 print_size()
 {
+    local dev="$1"
     local sectors
     sectors="$(hdparm -i $dev | grep "LBAsects=" | sed -e "s|.*LBAsects=\(.*\)|\1|")" #"
-    echo "$(($sectors/2/1024/1024)) MB"
+    # other method:
+    #sectors="$(blockdev --getsz $dev)"
+    echo "$(($sectors/2/1024/1024)) GB"
 }
 
+print_partsize()
+{
+    local dev="$1"
+    local sectors
+    local drive="$(basename $dev)"
+    sectors="$(cat /sys/class/block/$drive/size)"
+    echo "$(($sectors/2/1024/1024)) GB"
+}

hdd/print_mds.sh

+#!/bin/sh
+
+PROGDIR=$(dirname "$0")
+[ "$PROGDIR" = "." ] && PROGDIR=$(pwd)
+. $PROGDIR/functions.sh
+
+for dev in $(echo /sys/class/block/md*) ; do
+    echo "$(basename $dev)  $(print_partsize $dev)"
+done

hdd/set_writemostly.sh

@@ -23,7 +23,7 @@ for dev in /dev/sd? ; do
         use_in_md "$md" "$dev" || continue
         devpart="$(mdadm -D "$md" | grep "$dev" | sed -e "s|.*$dev|$dev|")"
         [ -b "$devpart" ] || exit
-        echo "  used in $md as $devpart, set $FLAG ..."
+        echo "  used in $md as $devpart  $(print_partsize $devpart), set $FLAG ..."
         echo "$FLAG" >/sys/block/$(basename $md)/md/dev-$(basename $devpart)/state
     done
 done

hdd/tests.sh

@@ -6,8 +6,8 @@ PROGDIR=$(dirname "$0")
 
 is_hdd /dev/sda && echo HDD || echo SSD
 dev=/dev/sda
-echo "$dev (Model $(print_model $dev), size $(print_size $dev)"
+echo "$dev, model $(print_model $dev), size $(print_size $dev), partsize $(print_partsize $dev)"
 
 dev=/dev/sdc
 is_hdd /dev/sdc && echo HDD || echo SSD
-echo "$dev (Model $(print_model $dev), size $(print_size $dev)"
+echo "$dev, model $(print_model $dev), size $(print_size $dev), partsize $(print_partsize ${dev}1)"