summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-01-09 18:03:47 +0000
committerThierry Vignaud <tv@mandriva.org>2009-01-09 18:03:47 +0000
commitf07f1f7bcbe00b87799ea13638e17cdd63d1daf6 (patch)
treec2d8e1a1e624d05acc892b11cf8ab08691f8d1ff
parent01106b0f03fb64452642baaca1b6f9796041b0c0 (diff)
downloaddrakx-f07f1f7bcbe00b87799ea13638e17cdd63d1daf6.tar
drakx-f07f1f7bcbe00b87799ea13638e17cdd63d1daf6.tar.gz
drakx-f07f1f7bcbe00b87799ea13638e17cdd63d1daf6.tar.bz2
drakx-f07f1f7bcbe00b87799ea13638e17cdd63d1daf6.tar.xz
drakx-f07f1f7bcbe00b87799ea13638e17cdd63d1daf6.zip
(bestKernel_extensions) do not install kernel-server on x86_64 when
there's more than 4Gb of RAM (#44709) ; use better heuristics
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/pkgs.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 937310e73..04a4bd888 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not install kernel-server on x86_64 when there's more than 4Gb of
+ RAM (#44709) ; use better heuristics
- propose ext4 filesystem during install now that it is stable
- include tools to edit partition labels
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index d3f5267ce..a5cef4f7a 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -134,7 +134,7 @@ sub bestKernel_extensions {
$o_match_all_hardware ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') :
detect_devices::is_xbox() ? '-xbox' :
detect_devices::is_i586() ? '-desktop586' :
- arch() =~ /i.86|x86_64/ && detect_devices::dmi_detect_memory() > 3.8 * 1024 ? '-server' :
+ arch() =~ /i.86/ && detect_devices::dmi_detect_memory() > 3.8 * 1024 || detect_devices::isServer() ? '-server' :
'-desktop';
}