summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-20 14:41:21 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-20 14:41:21 +0000
commit88508cbb6720e4c98ac4e335ec45dc9f3128d077 (patch)
treed230a81560541dab215196ad17190e718bba02ca
parent0f6ab93b4e7fdfb5cb4d8ebaa6d8add42e91a928 (diff)
downloaddrakx-88508cbb6720e4c98ac4e335ec45dc9f3128d077.tar
drakx-88508cbb6720e4c98ac4e335ec45dc9f3128d077.tar.gz
drakx-88508cbb6720e4c98ac4e335ec45dc9f3128d077.tar.bz2
drakx-88508cbb6720e4c98ac4e335ec45dc9f3128d077.tar.xz
drakx-88508cbb6720e4c98ac4e335ec45dc9f3128d077.zip
(bestKernel_extensions) do not uselessly install kernel-server on
x86_64 if more than 3.8Gb are availlable
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/pkgs.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1e35f33f7..b3ac7e05e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- do not uselessly install kernel-server on x86_64 if more than 3.8Gb
+ are availlable
+
Version 11.19 - 20 August 2008
- usbkbd is dead, using usbhid instead
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 42d8a541c..98e7c73c4 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' :
- detect_devices::dmi_detect_memory() > 3.8 * 1024 ? '-server' :
+ arch() =~ /i.86/ && detect_devices::dmi_detect_memory() > 3.8 * 1024 ? '-server' :
'-desktop';
}