From a8623ec0bc78216c0d3893c2df3df2b2ece5b40a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 24 Aug 2007 20:43:26 +0000
Subject: (bestKernelPackage) adapt to new kernel flavors

---
 perl-install/install/NEWS    | 2 ++
 perl-install/install/pkgs.pm | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0cfea93e0..3363a8bb5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- adapt to new kernel flavors
+
 Version 10.4.177 - 24 August 2007, by Pascal "Pixel" Rigaux
 
 - fix typo in banner name (otherwise internal_error)
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 3ee676a61..53e86f5b0 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -138,11 +138,12 @@ sub bestKernelPackage {
     my ($packages) = @_;
 
     my @preferred_exts =
-      $::o->{match_all_hardware} ? (arch() =~ /x86_64/ ? '' : '-legacy') :
-      $::build_globetrotter ? '' :
+      $::o->{match_all_hardware} ? (arch() =~ /x86_64/ ? '-desktop' : '-desktop586') :
+      $::build_globetrotter ? '-desktop' :
       detect_devices::is_xbox() ? '-xbox' :
-      detect_devices::is_i586() ? '-legacy' :
-      detect_devices::dmi_detect_memory() > 3.8 * 1024 ? '-enterprise' :
+      detect_devices::is_i586() ? '-desktop586' :
+      detect_devices::isLaptop() ? '-laptop' :
+      detect_devices::dmi_detect_memory() > 3.8 * 1024 ? '-server' :
       '';
 
     my @kernels = grep { $_ } map { packageByName($packages, "kernel$_-latest") } @preferred_exts, '';
-- 
cgit v1.2.1