summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-03 23:38:06 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-03 23:38:06 +0000
commita8a73d1a21029d7b7f36b2b3a809e864d2869c7b (patch)
tree99f725aed3ec4c7a2baf03e595e413ab7b5987c2
parent575431cc426facbb084dfc388d7b1066739c865c (diff)
downloaddrakx-backup-do-not-use-a8a73d1a21029d7b7f36b2b3a809e864d2869c7b.tar
drakx-backup-do-not-use-a8a73d1a21029d7b7f36b2b3a809e864d2869c7b.tar.gz
drakx-backup-do-not-use-a8a73d1a21029d7b7f36b2b3a809e864d2869c7b.tar.bz2
drakx-backup-do-not-use-a8a73d1a21029d7b7f36b2b3a809e864d2869c7b.tar.xz
drakx-backup-do-not-use-a8a73d1a21029d7b7f36b2b3a809e864d2869c7b.zip
(get_apple_boot_parts) extract it out of setupBootloader__general()
for readability
-rw-r--r--perl-install/any.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 93978fa6f..fa702bb6a 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -380,6 +380,11 @@ sub setupBootloader__mbr_or_not {
1;
}
+sub get_apple_boot_parts {
+ my ($fstab) = @_;
+ map { "/dev/$_" } (map { $_->{device} } (grep { isAppleBootstrap($_) } @$fstab));
+}
+
sub setupBootloader__general {
my ($in, $b, $all_hds, $fstab, $security) = @_;
@@ -451,7 +456,7 @@ sub setupBootloader__general {
{ label => N("Bootloader to use"), val => \$b->{method},
list => \@method_choices, format => \&bootloader::method2text },
{ label => N("Init Message"), val => \$b->{'init-message'} },
- { label => N("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (grep { isAppleBootstrap($_) } @$fstab)) ] },
+ { label => N("Boot device"), val => \$b->{boot}, list => [ get_apple_boot_parts($fstab) ] },
{ label => N("Open Firmware Delay"), val => \$b->{delay} },
{ label => N("Kernel Boot Timeout"), val => \$b->{timeout} },
{ label => N("Enable CD Boot?"), val => \$b->{enablecdboot}, type => "bool" },