Merge from master

plugins/dynamix/scripts/diskload

@@ -0,0 +1,29 @@
+#!/bin/bash
+ini=/var/local/emhttp/diskload.ini
+declare -a sector reads writes
+
+# t = poll interval in seconds
+t=6
+# get sector size of each disk
+c=0
+for dev in $(awk '/(sd[a-z]*|nvme[0-9]n1) /{print $3}' /proc/diskstats); do
+  sector[c]=$(cat /sys/block/$dev/queue/hw_sector_size 2>/dev/null)
+  [[ -z ${sector[c]} ]] && sector[c]=512
+  ((c++))
+done
+
+# start daemon
+while :; do
+  stats=($(awk '/(sd[a-z]*|nvme[0-9]n1) /{print $3,$6,$10,$4,$8}' /proc/diskstats))
+  c=0; s=${#stats[@]}
+  echo -n >$ini
+  for ((i=0;i<s;i+=5)); do
+    reads[c]=$((stats[i+1]-reads[c]))
+    writes[c]=$((stats[i+2]-writes[c]))
+    echo ${stats[i]}=$((reads[c]*sector[c]/t)) $((writes[c]*sector[c]/t)) ${stats[i+3]} ${stats[i+4]} >>$ini
+    reads[c]=${stats[i+1]}
+    writes[c]=${stats[i+2]}
+    ((c++))
+  done
+  sleep $t
+done &

plugins/dynamix/scripts/rc.diskload

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+script="diskload"
+daemon="/usr/local/emhttp/webGui/scripts/$script"
+
+case $1 in
+start)
+  if [[ -z $(pgrep -f $daemon) ]]; then
+    $daemon 1>/dev/null 2>&1
+    echo "$script started"
+  else
+    echo "$script already running!"
+  fi
+;;
+stop)
+  if [[ -n $(pgrep -f $daemon) ]]; then
+    pkill -f $daemon 1>/dev/null 2>&1
+    timer=5
+    until [[ -z $(pgrep -f $daemon) || $timer -eq 0 ]]; do
+      ((timer--))
+      sleep 1
+    done
+    echo "$script stopped"
+  else
+    echo "$script not running!"
+  fi
+;;
+*)
+  echo "Usage: $(basename $0) start|stop"
+esac