aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended/webmin/files/disable-version-check.patch
blob: 585303fb5a8ef9ee30a8d42be0794784a592184c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
# 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;
 &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'}) &&
-    &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'}) &&
+#    &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'};