From 0239a7da147283a0ab35cad6ae35c382447c1473 Mon Sep 17 00:00:00 2001 From: bergware Date: Sat, 18 Feb 2017 10:58:02 +0100 Subject: [PATCH 1/3] Ignore mover log entries in color coding --- plugins/dynamix/include/ColorCoding.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/include/ColorCoding.php b/plugins/dynamix/include/ColorCoding.php index 049fd453a..078ca296e 100644 --- a/plugins/dynamix/include/ColorCoding.php +++ b/plugins/dynamix/include/ColorCoding.php @@ -14,7 +14,7 @@ // Color coding for syslog and disk log $match = [['class' => 'text', - 'text' => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)'] + 'text' => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)','root: (>f|cd)\+\+\+\+','root: \.d\.\.t\.'] ], ['class' => 'login', 'text' => ['(accepted|failed) password','sshd\[\d+\]:'] From a8ff5b624d873d685721bfab00e39cd20ab478a1 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 6 Mar 2017 19:37:43 +0100 Subject: [PATCH 2/3] Fixed wrong reference to Display Settings in Main page --- plugins/dynamix/ArrayDevices.page | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix/ArrayDevices.page b/plugins/dynamix/ArrayDevices.page index 4507a17fe..6b46db7b3 100644 --- a/plugins/dynamix/ArrayDevices.page +++ b/plugins/dynamix/ArrayDevices.page @@ -87,13 +87,13 @@ if ($display['total']) echo "  includes the device model number, serial number, linux device id, and the device size. > > **Temp.** (temperature) is read directly from the device. You configure which units to use on -> the [Display Preferences](Settings/Display) page. We do not read the temperature of spun-down hard +> the [Display Preferences](Settings/DisplaySettings) page. We do not read the temperature of spun-down hard > drives since this typically causes them to spin up; instead we display the `*` symbol. We also > display the `*` symbol for SSD and Flash devices, though sometimes these devices do report a valid > temperature, and sometimes they return the value `0`. > > **Size, Used, Free** reports the total device size, used space, and remaining space for files. These -> units are also configured on the [Display Preferences](Settings/Display) page. The +> units are also configured on the [Display Preferences](Settings/DisplaySettings) page. The > amount of space used will be non-zero even for an empty disk due to file system overhead. > > *Note: for a multi-device cache pool, this data is for the entire pool as returned by btrfs.* @@ -111,7 +111,7 @@ if ($display['total']) echo "  **View** column contains a folder icon indicating the device is *mounted*. Click the icon to > browse the file system. > -> If "Display array totals" is enable on the [Display Preferences](Settings/Display) page, a +> If "Display array totals" is enable on the [Display Preferences](Settings/DisplaySettings) page, a > **Total** line is included which provides a tally of the device statistics, including the average temperature > of your devices. > From 0e96cf9c013885a16db177e5a0a9ade2b22c2605 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 20 Mar 2017 21:14:29 +0100 Subject: [PATCH 3/3] Fixed: missing creating of eth10 settings page --- plugins/dynamix/Eth0.page | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/dynamix/Eth0.page b/plugins/dynamix/Eth0.page index 62b4a0980..dffeedddd 100644 --- a/plugins/dynamix/Eth0.page +++ b/plugins/dynamix/Eth0.page @@ -21,8 +21,7 @@ $ini = '/var/local/emhttp/network.ini'; $validIP = '((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'; // get available ethernet ports (excluding eth0) -exec("ip -br addr|grep -Po '^eth[1-9]+\s'",$ports); -$ports = array_map('trim', $ports); +exec("ip -br addr|awk '/^eth[0-9]+\s/{print $1}'|grep -v '^eth0$'",$ports); // remove non-existing ethernet ports foreach (glob("$docroot/webGui/Eth[1-9]*.page",GLOB_NOSORT) as $port) {