summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2002-03-07 00:40:00 +0000
committerStew Benedict <stewb@mandriva.org>2002-03-07 00:40:00 +0000
commit920f7d3d0ed4129054a1bf563029cb8e095ec165 (patch)
treef54c6cf9af66819184f7e3a98432fc4eef4d3b16 /perl-install/any.pm
parentcab195d756d2c740385402de7e1cbf67e428f393 (diff)
downloaddrakx-920f7d3d0ed4129054a1bf563029cb8e095ec165.tar
drakx-920f7d3d0ed4129054a1bf563029cb8e095ec165.tar.gz
drakx-920f7d3d0ed4129054a1bf563029cb8e095ec165.tar.bz2
drakx-920f7d3d0ed4129054a1bf563029cb8e095ec165.tar.xz
drakx-920f7d3d0ed4129054a1bf563029cb8e095ec165.zip
drakboot functionality for PPC
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 591363911..bb7777aa0 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -162,7 +162,7 @@ sub setupBootloader {
my $prev_clean_tmp = my $clean_tmp = grep { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
$b->{vga} ||= 'normal';
- if (arch !~ /ppc/) {
+ if (arch() !~ /ppc/) {
$in->ask_from('', _("Bootloader main options"), [
{ label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate },
arch() =~ /sparc/ ? (
@@ -197,7 +197,7 @@ sub setupBootloader {
$b->{boot} = $partition_table_mac::bootstrap_part;
$in->ask_from('', _("Bootloader main options"), [
{ label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate },
- { label => _("Init Message"), val => \$b->{initmsg} },
+ { label => _("Init Message"), val => \$b->{init-message} },
{ label => _("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (grep { isAppleBootstrap($_) } @$fstab))], not_edit => !$::expert },
{ label => _("Open Firmware Delay"), val => \$b->{delay} },
{ label => _("Kernel Boot Timeout"), val => \$b->{timeout} },
@@ -236,7 +236,7 @@ sub setupBootloader {
# $b->{boot} !~ /$hds->[0]{device}/ && #- not the first disk
$b->{boot} =~ /\d$/ && #- on a partition
is_empty_hash_ref($b->{bios}) #- some bios mapping already there
- ) {
+ ) && (arch() !~ /ppc/)){
my $hd = $in->ask_from_listf('', _("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).