From 4821eb6873d389dfb698cb12b00f5f6868a06a27 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 19 Aug 2018 21:26:18 +0100
Subject: [PATCH] Fix display of disk i/o speed
---
src/freedombone-installer | 5 +++--
src/freedombone-utils-webadmin | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 9bcc7ebf1..7fdc5e24d 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1517,9 +1517,10 @@ function update_system_monitor {
test_drive=
fi
fi
+ disk_io_speed=20
+ disk_io_speed_percent=10
if [ "$test_drive" ]; then
- disk_io_speed_percent=0
- disk_io_speed=$(hdparm -t $test_drive | awk -F '= ' '{print $2}' | awk -F ' ' '{print $1}')
+ disk_io_speed=$(hdparm -t $test_drive | awk -F '= ' '{print $2}' | awk -F ' ' '{print $1}' | tail -n 1 | awk -F '.' '{print $1}')
if [ "$disk_io_speed" ]; then
disk_io_speed_percent=$((disk_io_speed * 100 / 500))
if [ $disk_io_speed_percent -gt 100 ]; then
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index bf2f167bf..47ff1b95f 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -766,9 +766,10 @@ function webadmin_update_system_monitor {
test_drive=
fi
fi
+ disk_io_speed=20
+ disk_io_speed_percent=10
if [ "$test_drive" ]; then
- disk_io_speed_percent=0
- disk_io_speed=$(hdparm -t $test_drive | awk -F '= ' '{print $2}' | awk -F ' ' '{print $1}')
+ disk_io_speed=$(hdparm -t $test_drive | awk -F '= ' '{print $2}' | awk -F ' ' '{print $1}' | tail -n 1 | awk -F '.' '{print $1}')
if [ "$disk_io_speed" ]; then
disk_io_speed_percent=$((disk_io_speed * 100 / 500))
if [ $disk_io_speed_percent -gt 100 ]; then
--
GitLab