diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.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 000000000..a9ee40507 --- /dev/null +++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | |||
@@ -0,0 +1,45 @@ | |||
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'}; | ||