Merge branch 'master' of github.com:webmin/webmin

webmin · Apr 30, 2024 · 0bd6579 · 0bd6579
2 parents d59c49b + fae522a
commit 0bd6579
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/proc/linux-lib.pl b/proc/linux-lib.pl
@@ -634,6 +634,14 @@ sub get_current_cpu_data
                             'temp' => int($2),
                          });
                     }
+
+		# Like in #2140
+                elsif (/Tctl:\s*([\+\-][0-9\.]+)/) {
+                    push(@cpu,
+                         {  'core' => 0,
+                            'temp' => int($1),
+                         });
+                    }
                 }
 
             # New line represents another device

diff --git a/webmin/os-eol-lib.pl b/webmin/os-eol-lib.pl
@@ -201,6 +201,11 @@ sub eol_update_cache
 {
 my $webmin_version = &get_webmin_version();
 if ($gconfig{'os_eol_db'} ne $webmin_version) {
+        # Invalidate EOL cache
+	foreach my $key ('os_eol_about', 'os_eol_expired',
+			 'os_eol_expiring') {
+		delete($gconfig{$key});
+		}
         # This is the first time we check
         # EOL data or after Webmin update
         my $eol_data = &eol_get_os_data();