diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-03-07 12:07:12 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-03-07 12:07:12 +0000 |
| commit | c0a11955a653356e6eba345a5bd9a2b057fec717 (patch) | |
| tree | 5c95e95a1123d16038798519bf7121ec38121b5c | |
| parent | 7841bef17e69e93f67162c8a96754c55b729298b (diff) | |
| download | drakx-backup-do-not-use-c0a11955a653356e6eba345a5bd9a2b057fec717.tar drakx-backup-do-not-use-c0a11955a653356e6eba345a5bd9a2b057fec717.tar.gz drakx-backup-do-not-use-c0a11955a653356e6eba345a5bd9a2b057fec717.tar.bz2 drakx-backup-do-not-use-c0a11955a653356e6eba345a5bd9a2b057fec717.tar.xz drakx-backup-do-not-use-c0a11955a653356e6eba345a5bd9a2b057fec717.zip | |
fix *some* stew errors
| -rw-r--r-- | perl-install/any.pm | 6 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index bb7777aa0..ed6ad3ba0 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -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->{init-message} }, + { 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} }, @@ -235,8 +235,8 @@ sub setupBootloader { if ($mixed_kind_of_disks && # $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/)){ + 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). diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 6975267be..0bbcc6f37 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -98,7 +98,7 @@ sub read($$) { } elsif ($_ eq 'init-message') { $v =~ s/\\n//g; $v =~ s/"//g; - $b{init-message} = $v; + $b{'init-message'} = $v; } else { $b{$_} = $v || 1; } @@ -114,7 +114,7 @@ sub read($$) { } } } - if (arch() != /ppc/) { + if (arch() !~ /ppc/) { delete $b{timeout} unless $b{prompt}; $_->{append} =~ s/^\s*"?(.*?)"?\s*$/$1/ foreach \%b, @{$b{entries}}; $b{timeout} = $b{timeout} / 10 if $b{timeout}; @@ -326,7 +326,7 @@ sub suggest { { defaultos => "linux", entries => [], - init-message => "Welcome to Mandrake Linux!", + 'init-message' => "Welcome to Mandrake Linux!", delay => 30, #- OpenFirmware delay timeout => 50, enableofboot => 1, |