diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index e4c199dc0..562a6e3f8 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -503,7 +503,7 @@ $(function() {
var watchdog = new NchanSubscriber('/sub/var');
watchdog.on('message', function(data){
var ini=parseINI(data);
- var status;
+ var status, progress;
if (ini['fsState']=="Stopped") {
status="Array Stopped";
}else if (ini['fsState']=="Starting") {
@@ -512,14 +512,16 @@ $(function() {
status="Array Started";
if (ini['mdResync'] > 0) {
var action;
- if (ini['mdResyncAction'].indexOf("recon")) action="Parity-Sync / Data-Rebuild";
- else if (ini['mdResyncAction'].indexOf("clear")) action="Clearing";
- else if (ini['mdResyncAction'] == "check") action="Read-Check";
- else if (ini['mdResyncAction'].indexOf("check")) action="Parity-Check";
+ if (ini['mdResyncAction'].indexOf("recon")>=0) action="Parity-Sync / Data-Rebuild";
+ else if (ini['mdResyncAction'].indexOf("clear")>=0) action="Clearing";
+ else if (ini['mdResyncAction'] == "check") action="Read-Check";
+ else if (ini['mdResyncAction'].indexOf("check")>=0) action="Parity-Check";
action += " " + (ini['mdResyncPos']/(ini['mdResync']/100+1)).toFixed(1) + " %";
status += "•"+action+"";
}
}
+ if (ini['fsProgress'].length)
+ status += "•"+ini['fsProgress']+"";
$('#statusbar').html(status);
});
watchdog.start();
diff --git a/plugins/dynamix/scripts/diskload b/plugins/dynamix/scripts/diskload
index 4440b9871..47161f9ca 100755
--- a/plugins/dynamix/scripts/diskload
+++ b/plugins/dynamix/scripts/diskload
@@ -1,5 +1,4 @@
#!/bin/bash
-# todo: this should generate/publish json-encoded string
ini=/var/local/emhttp/diskload.ini
declare -a sector reads writes