diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-23 14:05:43 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-23 14:05:43 +0000 |
| commit | 5d72c84a9b2db90cd61f8b06dfc5e9b20658e211 (patch) | |
| tree | 49c1ca6e2f01e71fd6f8180f77a1273d8513897a | |
| parent | 0936dccf3a3dbb7e09fac08e4af3d869f00d90f3 (diff) | |
| download | drakx-backup-do-not-use-5d72c84a9b2db90cd61f8b06dfc5e9b20658e211.tar drakx-backup-do-not-use-5d72c84a9b2db90cd61f8b06dfc5e9b20658e211.tar.gz drakx-backup-do-not-use-5d72c84a9b2db90cd61f8b06dfc5e9b20658e211.tar.bz2 drakx-backup-do-not-use-5d72c84a9b2db90cd61f8b06dfc5e9b20658e211.tar.xz drakx-backup-do-not-use-5d72c84a9b2db90cd61f8b06dfc5e9b20658e211.zip | |
don't use typeOfMBR to check the method on floppy which may not be inserted
(part of bugzilla #12213)
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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'; |