summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-10 15:16:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-10 15:16:55 +0000
commit93d86b675a45ae2d9989e480b1a1a380fdafa9b1 (patch)
tree9b65cd4c01a83719c170ca389e8889cf9a0f6ae3
parent64cb19f38747950a8e739b671ea5dbf763992047 (diff)
downloaddrakx-backup-do-not-use-93d86b675a45ae2d9989e480b1a1a380fdafa9b1.tar
drakx-backup-do-not-use-93d86b675a45ae2d9989e480b1a1a380fdafa9b1.tar.gz
drakx-backup-do-not-use-93d86b675a45ae2d9989e480b1a1a380fdafa9b1.tar.bz2
drakx-backup-do-not-use-93d86b675a45ae2d9989e480b1a1a380fdafa9b1.tar.xz
drakx-backup-do-not-use-93d86b675a45ae2d9989e480b1a1a380fdafa9b1.zip
- really fix setting lilo when needed (#39878)
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/NEWS1
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 45311d095..f98e04405 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1065,7 +1065,8 @@ sub suggest {
$bootloader->{default} ||= $preferred;
}
$bootloader->{default} ||= "linux";
- $bootloader->{method} ||= first(method_choices($all_hds, 1));
+ $bootloader->{method} ||= first(method_choices($all_hds, 1), # best installed
+ method_choices($all_hds, 0)); # or best if no valid one is installed
if (main_method($bootloader->{method}) eq 'grub') {
foreach my $c (find_other_distros_grub_conf($fstab)) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3345b9ebf..afca158f6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- really fix setting lilo when needed (#39878)
- handle new driver:
o ide: tx4939ide
- drakx-in-chroot: