summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2018-12-01 16:37:37 +0200
committerThomas Backlund <tmb@mageia.org>2018-12-01 16:37:37 +0200
commit4ca9b52413cb67149fb534979b338e8968c487cd (patch)
tree22256f912517442a7985f74b3a4b1679810a0665
parent5f0829d7c0db5a4f9d008434e8e1bcd12ca59b9f (diff)
downloaddrakx-4ca9b52413cb67149fb534979b338e8968c487cd.tar
drakx-4ca9b52413cb67149fb534979b338e8968c487cd.tar.gz
drakx-4ca9b52413cb67149fb534979b338e8968c487cd.tar.bz2
drakx-4ca9b52413cb67149fb534979b338e8968c487cd.tar.xz
drakx-4ca9b52413cb67149fb534979b338e8968c487cd.zip
dont select server kernel anymore on 32bit x86 with RAM > 3.8GB
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/pkgs.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 44deeafd9..278e3fe5c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- desktop kernels are now PAE, for PTI security fixes to work properly,
so if cpu is not supporting it, install the desktop586 kernel
+- dont select server kernel anymore on 32bit x86 with RAM > 3.8GB
Version 18.8 - 28 Nov 2018
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index c859fb880..ee3c83b54 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -152,7 +152,7 @@ sub packageByName {
sub _is_kernelServer_needed() {
# forbid selecting kernel-server if not having PAE since PAE support is mandatory for kernel-server:
return if !detect_devices::has_cpu_flag('pae');
- arch() =~ /i.86/ && detect_devices::dmi_detect_memory() > 3.8 * 1024 || detect_devices::isServer();
+ arch() =~ /i.86/ && detect_devices::isServer();
}
sub _bestKernel_extensions {