Khem Raj 294c0251f8
webmin: Upgrade to 2.111 release
Drop remove-python2.3.patch since corresponding script is gone

License-Update: Formatting changes

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2024-07-14 12:06:20 -07:00

51 lines
1.6 KiB
Diff

Disable OS version check in status screen
The code is not able to accurately detect the correct distro/version at
the moment.
Upstream-Status: Inappropriate
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -1170,38 +1170,6 @@ my %miniserv;
&get_miniserv_config(\%miniserv);
&load_theme_library(); # So that UI functions work
-# Need OS upgrade, but only once per day or if the system was rebooted
-my $now = time();
-my $uptime = &get_system_uptime();
-if (&foreign_available("webmin")) {
- my %realos;
- my @st = stat($realos_cache_file);
- if (!@st || $now - $st[9] > 24*60*60 ||
- $uptime && $now - $st[9] > $uptime) {
- %realos = &detect_operating_system(undef, 1);
- &write_file($realos_cache_file, \%realos);
- }
- else {
- &read_file($realos_cache_file, \%realos);
- }
- if (($realos{'os_version'} ne $gconfig{'os_version'} ||
- $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
- $realos{'os_type'} ne $gconfig{'os_type'}) &&
- $realos{'os_version'} && $realos{'os_type'} &&
- &foreign_available("webmin")) {
- # Tell the user that OS version was updated
- push(@notifs,
- &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi").
- &text('os_incorrect',
- $realos{'real_os_type'},
- $realos{'real_os_version'}).
- &show_os_release_notes($realos{'real_os_version'}).
- "<p>\n".
- &ui_form_end([ [ undef, $text{'os_fix'} ] ])
- );
- }
- }
-
# Password close to expiry
my $warn_days = $config{'warn_days'};
if (&foreign_check("acl")) {