diff --git a/benchmark.sh.ORIG b/benchmark.sh.VJR.DISK index a5c3e4f..26410b5 100755 --- a/benchmark.sh.ORIG +++ b/benchmark.sh.VJR.DISK @@ -643,8 +643,8 @@ collect_sysinfo() { printf "%dd %dh %dm", d, h, m}' /proc/uptime 2>/dev/null) R_LOAD=$(awk '{printf "%s %s %s", $1, $2, $3}' /proc/loadavg 2>/dev/null) local dtot dused - dtot=$(df -k --total -x tmpfs -x devtmpfs -x overlay -x squashfs 2>/dev/null | awk '/^total/ {print $2}') - dused=$(df -k --total -x tmpfs -x devtmpfs -x overlay -x squashfs 2>/dev/null | awk '/^total/ {print $3}') + dtot=$(lsblk -d -b -o SIZE,TYPE,TRAN | awk '$2 == "disk" && $3 != "" {total += $1} END {print int(total / 1024)}') + dused=$(df -l -P -k 2>/dev/null | awk 'NR == 1 { next } !seen[$1]++ { used += $3 } END { print int(used) }') [[ -n "$dtot" ]] && R_DISK="$(fmt_kib "${dused:-0}") used / $(fmt_kib "$dtot")" # virtualization if exists systemd-detect-virt; then