1*4882a593SmuzhiyunDisable OS version check in status screen 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunThe code is not able to accurately detect the correct distro/version at 4*4882a593Smuzhiyunthe moment. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-status: Inappropriate 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunIndex: webmin-1.850/webmin/webmin-lib.pl 11*4882a593Smuzhiyun=================================================================== 12*4882a593Smuzhiyun--- webmin-1.850.orig/webmin/webmin-lib.pl 13*4882a593Smuzhiyun+++ webmin-1.850/webmin/webmin-lib.pl 14*4882a593Smuzhiyun@@ -1112,28 +1112,28 @@ my %miniserv; 15*4882a593Smuzhiyun &load_theme_library(); # So that UI functions work 16*4882a593Smuzhiyun 17*4882a593Smuzhiyun # Need OS upgrade 18*4882a593Smuzhiyun-my %realos = &detect_operating_system(undef, 1); 19*4882a593Smuzhiyun-if (($realos{'os_version'} ne $gconfig{'os_version'} || 20*4882a593Smuzhiyun- $realos{'os_type'} ne $gconfig{'os_type'}) && 21*4882a593Smuzhiyun- $realos{'os_version'} && $realos{'os_type'} && 22*4882a593Smuzhiyun- &foreign_available("webmin")) { 23*4882a593Smuzhiyun- my ($realminor) = split(/\./, $realos{'os_version'}); 24*4882a593Smuzhiyun- my ($minor) = split(/\./, $gconfig{'os_version'}); 25*4882a593Smuzhiyun- if ($realos{'os_type'} eq $gconfig{'os_type'} && 26*4882a593Smuzhiyun- $realminor == $minor) { 27*4882a593Smuzhiyun- # Only the minor version number changed - no need to apply 28*4882a593Smuzhiyun- &apply_new_os_version(\%realos); 29*4882a593Smuzhiyun- } 30*4882a593Smuzhiyun- else { 31*4882a593Smuzhiyun- # Large enough change to tell the user 32*4882a593Smuzhiyun- push(@notifs, 33*4882a593Smuzhiyun- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). 34*4882a593Smuzhiyun- &text('os_incorrect', $realos{'real_os_type'}, 35*4882a593Smuzhiyun- $realos{'real_os_version'})."<p>\n". 36*4882a593Smuzhiyun- &ui_form_end([ [ undef, $text{'os_fix'} ] ]) 37*4882a593Smuzhiyun- ); 38*4882a593Smuzhiyun- } 39*4882a593Smuzhiyun- } 40*4882a593Smuzhiyun+#my %realos = &detect_operating_system(undef, 1); 41*4882a593Smuzhiyun+#if (($realos{'os_version'} ne $gconfig{'os_version'} || 42*4882a593Smuzhiyun+# $realos{'os_type'} ne $gconfig{'os_type'}) && 43*4882a593Smuzhiyun+# $realos{'os_version'} && $realos{'os_type'} && 44*4882a593Smuzhiyun+# &foreign_available("webmin")) { 45*4882a593Smuzhiyun+# my ($realminor) = split(/\./, $realos{'os_version'}); 46*4882a593Smuzhiyun+# my ($minor) = split(/\./, $gconfig{'os_version'}); 47*4882a593Smuzhiyun+# if ($realos{'os_type'} eq $gconfig{'os_type'} && 48*4882a593Smuzhiyun+# $realminor == $minor) { 49*4882a593Smuzhiyun+# # Only the minor version number changed - no need to apply 50*4882a593Smuzhiyun+# &apply_new_os_version(\%realos); 51*4882a593Smuzhiyun+# } 52*4882a593Smuzhiyun+# else { 53*4882a593Smuzhiyun+# # Large enough change to tell the user 54*4882a593Smuzhiyun+# push(@notifs, 55*4882a593Smuzhiyun+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). 56*4882a593Smuzhiyun+# &text('os_incorrect', $realos{'real_os_type'}, 57*4882a593Smuzhiyun+# $realos{'real_os_version'})."<p>\n". 58*4882a593Smuzhiyun+# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) 59*4882a593Smuzhiyun+# ); 60*4882a593Smuzhiyun+# } 61*4882a593Smuzhiyun+# } 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun # Password close to expiry 64*4882a593Smuzhiyun my $warn_days = $config{'warn_days'}; 65