Fix to support more fancy sensor command outputs

webmin · May 16, 2021 · 7fe97a7 · 7fe97a7 · iliajie · May 16, 2021
1 parent 8865993
commit 7fe97a7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/proc/linux-lib.pl b/proc/linux-lib.pl
@@ -523,7 +523,10 @@ sub get_current_cpu_temps
 				    /in[\d+]:\s+[\+\-0-9\.]+\s+V/i);
 
 			# Get odd output like in #1253
-			if ($aa && /temp(\d+):\s+([\+\-][0-9\.]+)\s+.*?[=+].*?\)/) {
+			if ($aa && (
+				/temp(\d+):\s+([\+\-][0-9\.]+)\s+.*?[=+].*?\)/ ||
+				/temp(\d+):\s+([\+\-][0-9\.]+).*?°[Cc]\s+.*?[=+].*?\)/
+			)) {
 				# Adjust to start from `0` as all other outputs
 				push(@rvx, { 'core' => (int($1) - 1),
 					     'temp' => $2 });