diff options
Diffstat (limited to 'recipes-extended/webmin/files/disable-version-check.patch')
| -rw-r--r-- | recipes-extended/webmin/files/disable-version-check.patch | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/recipes-extended/webmin/files/disable-version-check.patch b/recipes-extended/webmin/files/disable-version-check.patch index 585303f..a9ee405 100644 --- a/recipes-extended/webmin/files/disable-version-check.patch +++ b/recipes-extended/webmin/files/disable-version-check.patch @@ -1,18 +1,24 @@ -# Disable OS version check in status screen, since it 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> ---- webmin-1.570.orig/webmin/webmin-lib.pl -+++ webmin-1.570/webmin/webmin-lib.pl -@@ -1055,17 +1055,18 @@ my %miniserv; +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"). @@ -25,6 +31,7 @@ +#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"). |