From 5d72c84a9b2db90cd61f8b06dfc5e9b20658e211 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 23 Nov 2004 14:05:43 +0000 Subject: don't use typeOfMBR to check the method on floppy which may not be inserted (part of bugzilla #12213) --- perl-install/bootloader.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index b3c9b045b..066335e0b 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -150,7 +150,7 @@ sub read { foreach my $main_method (uniq(map { main_method($_) } @methods)) { my $f = $bootloader::{"read_$main_method"} or die "unknown bootloader method $main_method (read)"; my $bootloader = $f->($fstab); - my $type = partition_table::raw::typeOfMBR($bootloader->{boot}); + my $type = $bootloader->{boot} =~ m!/fd\d+$! ? $main_method : partition_table::raw::typeOfMBR($bootloader->{boot}); warn "typeOfMBR $type on $bootloader->{boot} for method $main_method\n" if $ENV{DEBUG}; if ($type eq $main_method) { my @prefered_entries = map { get_label($_, $bootloader) } $bootloader->{default}, 'linux'; -- cgit v1.2.1