summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-05-24 20:18:42 +0000
committerThierry Vignaud <tv@mageia.org>2011-05-24 20:18:42 +0000
commitf496895ec638963a03385a75e7bcf2f9d16c9d28 (patch)
treea59a34b1c7015c7a9f68dd2205ae2c6a60c34558 /perl-install/install
parent0a8820a79be0b071b4119c843405920e4e82c782 (diff)
downloaddrakx-f496895ec638963a03385a75e7bcf2f9d16c9d28.tar
drakx-f496895ec638963a03385a75e7bcf2f9d16c9d28.tar.gz
drakx-f496895ec638963a03385a75e7bcf2f9d16c9d28.tar.bz2
drakx-f496895ec638963a03385a75e7bcf2f9d16c9d28.tar.xz
drakx-f496895ec638963a03385a75e7bcf2f9d16c9d28.zip
(_is_kernelServer_needed) forbid selecting kernel-server if not
having PAE since PAE support is mandatory for kernel-server (#1414)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/pkgs.pm2
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index bdc2dd8fa..ef9fd1dad 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- forbid selecting kernel-server if not having PAE since PAE support is
+ mandatory for kernel-server (#1414)
+
Version 13.54 - 19 May 2011
- advertize LibreOffice instead of OpenOffice.org (mga#1323)
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index d734ebb73..389fffcc7 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -106,6 +106,8 @@ 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();
}