From bd317178bee57d9a917ee171f34b48dbdd235423 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 3 Oct 2007 09:29:31 +0000 Subject: - bootloader: o if there is a /boot, check /boot instead of "/" to allow grub or not --- perl-install/bootloader.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 5e311e348..ae99ad69f 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1054,11 +1054,12 @@ sub method_choices { my ($all_hds, $b_prefix_mounted) = @_; my $fstab = [ fs::get::fstab($all_hds) ]; my $root_part = fs::get::root($fstab); + my $boot_part = fs::get::root($fstab, 'boot'); my $have_dmraid = find { fs::type::is_dmraid($_) } @{$all_hds->{hds}}; grep { !(/lilo/ && (isLoopback($root_part) || $have_dmraid)) - && !(/grub/ && isRAID($root_part)) + && !(/grub/ && isRAID($boot_part)) && !(/grub-graphic/ && cat_("/proc/cmdline") =~ /console=ttyS/); } method_choices_raw($b_prefix_mounted); } -- cgit v1.2.1