summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
diff options
context:
space:
mode:
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.patch16
1 files changed, 15 insertions, 1 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
index 46b1f7c7b8..3315aa579b 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
@@ -9,7 +9,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9 9
10--- a/webmin/webmin-lib.pl 10--- a/webmin/webmin-lib.pl
11+++ b/webmin/webmin-lib.pl 11+++ b/webmin/webmin-lib.pl
12@@ -1170,38 +1170,6 @@ my %miniserv; 12@@ -1234,52 +1234,6 @@ my %miniserv;
13 &get_miniserv_config(\%miniserv); 13 &get_miniserv_config(\%miniserv);
14 &load_theme_library(); # So that UI functions work 14 &load_theme_library(); # So that UI functions work
15 15
@@ -27,6 +27,20 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
27- else { 27- else {
28- &read_file($realos_cache_file, \%realos); 28- &read_file($realos_cache_file, \%realos);
29- } 29- }
30- my $new_real = $realos{'real_os_version'};
31- my $old_real = $gconfig{'real_os_version'};
32- $new_real =~ s/\.\d+$//;
33- $old_real =~ s/\.\d+$//;
34- if ($realos{'real_os_type'} eq $gconfig{'real_os_type'} &&
35- $new_real eq $old_real &&
36- $realos{'real_os_version'} ne $gconfig{'real_os_version'}) {
37- # Only the minor OS version has changed, just silently update it
38- &lock_file("$config_directory/config");
39- $gconfig{'real_os_version'} = $realos{'real_os_version'};
40- $gconfig{'os_version'} = $realos{'os_version'};
41- &write_file("$config_directory/config", \%gconfig);
42- &unlock_file("$config_directory/config");
43- }
30- if (($realos{'os_version'} ne $gconfig{'os_version'} || 44- if (($realos{'os_version'} ne $gconfig{'os_version'} ||
31- $realos{'real_os_version'} ne $gconfig{'real_os_version'} || 45- $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
32- $realos{'os_type'} ne $gconfig{'os_type'}) && 46- $realos{'os_type'} ne $gconfig{'os_type'}) &&