diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-09-14 15:55:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-09-14 15:55:28 +0000 |
| commit | ad456d6921ebf6ba5ed9155a5a97c024418ef48f (patch) | |
| tree | 86f706d24766044fbdf1890dc40c2902a913b8d0 | |
| parent | b22b536ece5f5aee7d247f0f6d9444a5626d73c5 (diff) | |
| download | drakx-ad456d6921ebf6ba5ed9155a5a97c024418ef48f.tar drakx-ad456d6921ebf6ba5ed9155a5a97c024418ef48f.tar.gz drakx-ad456d6921ebf6ba5ed9155a5a97c024418ef48f.tar.bz2 drakx-ad456d6921ebf6ba5ed9155a5a97c024418ef48f.tar.xz drakx-ad456d6921ebf6ba5ed9155a5a97c024418ef48f.zip | |
if we have dmraid devices, use grub, and not only if the boot device is on dmraid (bugzilla #18386)
| -rw-r--r-- | perl-install/bootloader.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 4f431697a..916eb31eb 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -925,11 +925,10 @@ sub method_choices { my ($all_hds) = @_; my $fstab = [ fs::get::fstab($all_hds) ]; my $root_part = fs::get::root($fstab); - my $boot_part = fs::get::root($fstab, 'boot'); - my $boot_disk = fs::get::part2hd($boot_part, $all_hds); + my $have_dmraid = find { fs::type::is_dmraid($_) } @{$all_hds->{hds}}; grep { - (!/lilo/ || !isLoopback($root_part) && !fs::type::is_dmraid($boot_disk)) + (!/lilo/ || !isLoopback($root_part) && !$have_dmraid) && (!/lilo-graphic/ || !detect_devices::matching_desc__regexp('ProSavageDDR')) && (!/grub/ || !isRAID($root_part)); } method_choices_raw(1); |