michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-22 12:10:28 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add to accept CPU fan speed sensor labels

Browse Source 
Allow dashboard CPU fan detection to recognize lm-sensors labels like “cpu fan speed” while leaving non-CPU fan labels ignored.

https://github.com/webmin/webmin/issues/1737
This commit is contained in:
Ilia Ross
2026-06-21 21:11:58 +02:00
parent 65f5beeb11
commit d3be11911e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proc/linux-lib.pl
View File

@@ -574,7 +574,7 @@ if (&has_command("sensors")) {
# and/or 'cpu fan 1', 'cpu_fan1', 'cpufan1', 'cpu_fan 2', 'cpu_fan2',
# 'cpufan2' etc.
my ($cpu_fan_num, $cpu_fan_rpm) =
$_ =~ /(?|^\s*cpu[_ ]?fan(?:[_ ]?(\d+))?\s*:\s*(\d+)\s*rpm)/i;
$_ =~ /^\s*cpu[_ ]?fan(?:[_ ]?(\d+))?(?:[_ ]?(?:speed|rpm))?\s*:\s*(\d+)\s*rpm/i;
$cpu_fan_num //= 1 if (defined($cpu_fan_rpm));
$cpu++ if ($cpu_volt || $cpu_fan_num);
@@ -785,7 +785,7 @@ if (@cpu || !@fans) {
# Fan RPM
if (defined $chip && $chip =~ /fan$/i &&
/\b(?:cpu[_ ]?fan(?:\s*\d+)?|fan\d+)\s*:\s*(\d+)\s*rpm\b/i) {
/\b(?:cpu[_ ]?fan(?:\s*\d+)?(?:\s*(?:speed|rpm))?|fan\d+)\s*:\s*(\d+)\s*rpm\b/i) {
my $rpm = $1 + 0;
$fan_rpm = $rpm if (!$fan_rpm || $rpm > $fan_rpm);
next;