From d3be11911e452e74e47fe724fe65e04fd474c157 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Sun, 21 Jun 2026 21:11:58 +0200
Subject: [PATCH] Add to accept CPU fan speed sensor labels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 proc/linux-lib.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proc/linux-lib.pl b/proc/linux-lib.pl
index 5ad98fc38..f1c14b6d5 100755
--- a/proc/linux-lib.pl
+++ b/proc/linux-lib.pl
@@ -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;