From ed5d6dbf4cf6fc12f39093614dc7b6a960dcd6d3 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 30 Oct 2009 23:31:43 +0000
Subject: fallback on most generic kernel if the suitable one is not available
 (only kernel-desktop586-latest is available on Dual ISO for i586)

---
 perl-install/install/NEWS    | 3 +++
 perl-install/install/pkgs.pm | 7 +++++++
 2 files changed, 10 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9c14efa34..3859ca2d2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- fallback on most generic kernel if the suitable one is not available
+  (only kernel-desktop586-latest is available on Dual ISO for i586)
+
 Version 12.76 - 30 October 2009
 
 - test existence of /usr/share/bootsplash/scripts/make-boot-splash
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index e3d453791..6e01f37e8 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -117,6 +117,13 @@ sub bestKernelPackage {
     my @preferred_exts = _bestKernel_extensions($o_match_all_hardware);
     my @kernels = grep { $_ } map { packageByName($packages, "kernel$_-latest") } @preferred_exts;
 
+    if (!@kernels) {
+        #- fallback on most generic kernel if the suitable one is not available
+        #- (only kernel-desktop586-latest is available on Dual ISO for i586)
+        my @fallback_exts = _bestKernel_extensions('force');
+        @kernels = grep { $_ } map { packageByName($packages, "kernel$_-latest") } @fallback_exts;
+    }
+
     log::l("bestKernelPackage (" . join(':', @preferred_exts) . "): " . join(' ', map { $_->name } @kernels) . (@kernels > 1 ? ' (choosing the first)' : ''));
 
     $kernels[0];
-- 
cgit v1.2.1