summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-17 13:45:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-17 13:45:57 +0000
commit18aa8aba1f73c23d5cf890a149ee254237adea7b (patch)
tree57151a21c98d4ed971044496ef778477dea235c7
parentf87100509bee8f9a6b8798d59723feb3de17c6fe (diff)
downloaddrakx-18aa8aba1f73c23d5cf890a149ee254237adea7b.tar
drakx-18aa8aba1f73c23d5cf890a149ee254237adea7b.tar.gz
drakx-18aa8aba1f73c23d5cf890a149ee254237adea7b.tar.bz2
drakx-18aa8aba1f73c23d5cf890a149ee254237adea7b.tar.xz
drakx-18aa8aba1f73c23d5cf890a149ee254237adea7b.zip
on ia64, use method lilo
-rw-r--r--perl-install/bootloader.pm23
1 files changed, 13 insertions, 10 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 765978360..6429cb00a 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -673,18 +673,21 @@ sub detect_bootloader() {
sub method_choices {
my ($fstab, $bootloader) = @_;
- my %choices = (
- if_(arch() =~ /sparc/,
+ my %choices =
+ arch() =~ /sparc/ ? (
'silo' => N("SILO"),
- ), if_(arch() !~ /sparc|ppc/ && !isLoopback(fsedit::get_root($fstab)) && whereis_binary('lilo'),
- if_(!detect_devices::matching_desc('ProSavageDDR'), 'lilo-graphic' => N("LILO with graphical menu")),
- 'lilo-menu' => N("LILO with text menu"),
- ), if_(arch() !~ /sparc|ppc/ && !isRAID(fsedit::get_root($fstab)) && whereis_binary('grub'),
- 'grub' => N("Grub"),
- ), if_(arch() =~ /ppc/,
+ ) : arch() =~ /ppc/ ? (
'yaboot' => N("Yaboot"),
- ),
- );
+ ) : arch() =~ /ia64/ ? (
+ 'lilo' => N("Elilo"),
+ ) : (
+ if_(!isLoopback(fsedit::get_root($fstab)) && whereis_binary('lilo'),
+ if_(!detect_devices::matching_desc('ProSavageDDR'), 'lilo-graphic' => N("LILO with graphical menu")),
+ 'lilo-menu' => N("LILO with text menu"),
+ ), if_(!isRAID(fsedit::get_root($fstab)) && whereis_binary('grub'),
+ 'grub' => N("Grub"),
+ ),
+ );
my $prefered;
$prefered ||= 'grub' if $::isStandalone && detect_bootloader() =~ /GRUB/;
$prefered ||= 'lilo-' . (member($bootloader->{install}, 'text', 'menu', 'graphic') ? $bootloader->{install} : 'graphic');