summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-30 23:31:43 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-30 23:31:43 +0000
commited5d6dbf4cf6fc12f39093614dc7b6a960dcd6d3 (patch)
tree9ea150cc2709e8c02b215d3fa45dacdebe317782
parent9218b9adc6f79113f7123f66754f5523a4bb7f95 (diff)
downloaddrakx-backup-do-not-use-ed5d6dbf4cf6fc12f39093614dc7b6a960dcd6d3.tar
drakx-backup-do-not-use-ed5d6dbf4cf6fc12f39093614dc7b6a960dcd6d3.tar.gz
drakx-backup-do-not-use-ed5d6dbf4cf6fc12f39093614dc7b6a960dcd6d3.tar.bz2
drakx-backup-do-not-use-ed5d6dbf4cf6fc12f39093614dc7b6a960dcd6d3.tar.xz
drakx-backup-do-not-use-ed5d6dbf4cf6fc12f39093614dc7b6a960dcd6d3.zip
fallback on most generic kernel if the suitable one is not available
(only kernel-desktop586-latest is available on Dual ISO for i586)
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/pkgs.pm7
2 files changed, 10 insertions, 0 deletions
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];