diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-13 16:07:42 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-31 17:41:21 +0100 |
| commit | 246bedc1c6b3e2830ca0a8fae8c30b8624f46ab2 (patch) | |
| tree | 94a6f18f2e80048ba3441bc8ad14281a76304256 /meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | |
| parent | fe155a77f3e64abcb2c23064fc93d0815e7d99a0 (diff) | |
| download | meta-openembedded-contrib-246bedc1c6b3e2830ca0a8fae8c30b8624f46ab2.tar.gz | |
webmin: add from meta-baryon
No changes.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch')
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch new file mode 100644 index 0000000000..a9ee405075 --- /dev/null +++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -0,0 +1,45 @@ +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> + +diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl +index 57a37f7..838b944 100755 +--- a/webmin/webmin-lib.pl ++++ b/webmin/webmin-lib.pl +@@ -1059,18 +1059,19 @@ my %miniserv; + &load_theme_library(); # So that UI functions work + + # Need OS upgrade +-my %realos = &detect_operating_system(undef, 1); +-if (($realos{'os_version'} ne $gconfig{'os_version'} || +- $realos{'os_type'} ne $gconfig{'os_type'}) && +- $realos{'os_version'} && $realos{'os_type'} && +- &foreign_available("webmin")) { +- push(@notifs, +- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). +- &text('os_incorrect', $realos{'real_os_type'}, +- $realos{'real_os_version'})."<p>\n". +- &ui_form_end([ [ undef, $text{'os_fix'} ] ]) +- ); +- } ++# Disabled for now as os-chooser.pl does not work on our system ++#my %realos = &detect_operating_system(undef, 1); ++#if (($realos{'os_version'} ne $gconfig{'os_version'} || ++# $realos{'os_type'} ne $gconfig{'os_type'}) && ++# $realos{'os_version'} && $realos{'os_type'} && ++# &foreign_available("webmin")) { ++# push(@notifs, ++# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). ++# &text('os_incorrect', $realos{'real_os_type'}, ++# $realos{'real_os_version'})."<p>\n". ++# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) ++# ); ++# } + + # Password close to expiry + my $warn_days = $config{'warn_days'}; |