michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to accommodate Raspberry Pi sensors output #1280

Browse Source
This commit is contained in:
Ilia Rostovtsev
2020-08-10 22:43:45 +03:00
parent 3cf65f8057
commit a2f88e1d1a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proc/linux-lib.pl
View File

@@ -512,9 +512,10 @@ if (&has_command("sensors")) {
$a = 0 if (/^\s*$/);
# Device has either fan or voltage data (sign of CPU)
$a = 1 if (/fan[\d+]:\s+[0-9]+\s+RPM/i ||
/in[\d+]:\s+[\+\-0-9\.]+\s+V/i);
# Get odd output like in #1253
if ($a && /temp(\d+):\s+([\+\-][0-9\.]+)\s+.*?[=+].*?\)/) {
/in[\d+]:\s+[\+\-0-9\.]+\s+V/i ||
/cpu_thermal-virtual-[\d]+/i);
# Get odd output like in #1253 #1280
if ($a && /temp(\d+):\s+([\+\-][0-9\.]+)/) {
# Adjust to start from `0` as all other outputs
push(@rv, { 'core' => (int($1) - 1),
'temp' => $2 });