diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-23 14:03:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-23 14:03:08 +0000 |
| commit | 0da82096be85c1477a062f650d51cf34c860a1c0 (patch) | |
| tree | 5ed492b91daa05d40a3d8dfbdd9e43db33ac6210 | |
| parent | 73a87a8fb548d5836bca9f9d248f0508018a4121 (diff) | |
| download | drakx-0da82096be85c1477a062f650d51cf34c860a1c0.tar drakx-0da82096be85c1477a062f650d51cf34c860a1c0.tar.gz drakx-0da82096be85c1477a062f650d51cf34c860a1c0.tar.bz2 drakx-0da82096be85c1477a062f650d51cf34c860a1c0.tar.xz drakx-0da82096be85c1477a062f650d51cf34c860a1c0.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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 310c00041..29bf33959 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -161,7 +161,10 @@ sub read { } my ($type) = map { - if (my $type = partition_table::raw::typeOfMBR($_)) { + if (m!/fd\d+$!) { + warn "not checking the method on floppy, assuming $main_method is right\n"; + $main_method; + } elsif (my $type = partition_table::raw::typeOfMBR($_)) { warn "typeOfMBR $type on $_ for method $main_method\n" if $ENV{DEBUG}; $type; } else { () } |