diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-19 16:21:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-19 16:21:14 +0000 |
| commit | 7cbc047cdc3d2bb05f8216b5efd5bbf859812932 (patch) | |
| tree | fa7ee2189cc5b93868ab51ac4529f343a68df14b | |
| parent | 2e817a5aa5b7edb57703002d08cf4a243b3dd32a (diff) | |
| download | drakx-backup-do-not-use-7cbc047cdc3d2bb05f8216b5efd5bbf859812932.tar drakx-backup-do-not-use-7cbc047cdc3d2bb05f8216b5efd5bbf859812932.tar.gz drakx-backup-do-not-use-7cbc047cdc3d2bb05f8216b5efd5bbf859812932.tar.bz2 drakx-backup-do-not-use-7cbc047cdc3d2bb05f8216b5efd5bbf859812932.tar.xz drakx-backup-do-not-use-7cbc047cdc3d2bb05f8216b5efd5bbf859812932.zip | |
create _ask_boot_bios_drive() out of setupBootloader__boot_bios_drive()
(ie prepare for next commit)
| -rw-r--r-- | perl-install/any.pm | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 5eb8a2a36..b79c5e006 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -302,12 +302,21 @@ sub setupBootloader_simple { sub setupBootloader__boot_bios_drive { my ($in, $b, $hds) = @_; - bootloader::mixed_kind_of_disks($hds) && - $b->{boot} =~ /\d$/ && #- on a partition - is_empty_hash_ref($b->{bios}) && #- some bios mapping already there - arch() !~ /ppc/ or return 1; + if (arch() =~ /ppc/ || + !is_empty_hash_ref($b->{bios})) { + #- some bios mapping already there + return 1; + } elsif (bootloader::mixed_kind_of_disks($hds) && $b->{boot} =~ /\d$/) { #- on a partition + _ask_boot_bios_drive($in, $b, $hds); + } else { + 1; + } +} + +sub _ask_boot_bios_drive { + my ($in, $b, $hds) = @_; - log::l("mixed_kind_of_disks"); + log::l("_ask_boot_bios_drive"); my $hd = $in->ask_from_listf('', N("You decided to install the bootloader on a partition. This implies you already have a bootloader on the hard drive you boot (eg: System Commander). |