| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Disable OS version check in status screen |
| 2 | |
| 3 | The code is not able to accurately detect the correct distro/version at |
| 4 | the moment. |
| 5 | |
| 6 | Upstream-status: Inappropriate |
| 7 | |
| 8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 9 | |
| 10 | diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl |
| 11 | index 57a37f7..838b944 100755 |
| 12 | --- a/webmin/webmin-lib.pl |
| 13 | +++ b/webmin/webmin-lib.pl |
| 14 | @@ -1059,18 +1059,19 @@ my %miniserv; |
| 15 | &load_theme_library(); # So that UI functions work |
| 16 | |
| 17 | # Need OS upgrade |
| 18 | -my %realos = &detect_operating_system(undef, 1); |
| 19 | -if (($realos{'os_version'} ne $gconfig{'os_version'} || |
| 20 | - $realos{'os_type'} ne $gconfig{'os_type'}) && |
| 21 | - $realos{'os_version'} && $realos{'os_type'} && |
| 22 | - &foreign_available("webmin")) { |
| 23 | - push(@notifs, |
| 24 | - &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). |
| 25 | - &text('os_incorrect', $realos{'real_os_type'}, |
| 26 | - $realos{'real_os_version'})."<p>\n". |
| 27 | - &ui_form_end([ [ undef, $text{'os_fix'} ] ]) |
| 28 | - ); |
| 29 | - } |
| 30 | +# Disabled for now as os-chooser.pl does not work on our system |
| 31 | +#my %realos = &detect_operating_system(undef, 1); |
| 32 | +#if (($realos{'os_version'} ne $gconfig{'os_version'} || |
| 33 | +# $realos{'os_type'} ne $gconfig{'os_type'}) && |
| 34 | +# $realos{'os_version'} && $realos{'os_type'} && |
| 35 | +# &foreign_available("webmin")) { |
| 36 | +# push(@notifs, |
| 37 | +# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). |
| 38 | +# &text('os_incorrect', $realos{'real_os_type'}, |
| 39 | +# $realos{'real_os_version'})."<p>\n". |
| 40 | +# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) |
| 41 | +# ); |
| 42 | +# } |
| 43 | |
| 44 | # Password close to expiry |
| 45 | my $warn_days = $config{'warn_days'}; |