diff options
| author | Erwan Velu <erwan@mandriva.org> | 2003-02-26 11:14:59 +0000 |
|---|---|---|
| committer | Erwan Velu <erwan@mandriva.org> | 2003-02-26 11:14:59 +0000 |
| commit | 4405a8d65d909fbfe257fb99c0d13d2803fdd200 (patch) | |
| tree | b8cacb4e5b5d17819d07dda268066996009d1f68 | |
| parent | 07dc2ddb40089c216ab4ff323de177ecab8f02ef (diff) | |
| download | drakx-backup-do-not-use-4405a8d65d909fbfe257fb99c0d13d2803fdd200.tar drakx-backup-do-not-use-4405a8d65d909fbfe257fb99c0d13d2803fdd200.tar.gz drakx-backup-do-not-use-4405a8d65d909fbfe257fb99c0d13d2803fdd200.tar.bz2 drakx-backup-do-not-use-4405a8d65d909fbfe257fb99c0d13d2803fdd200.tar.xz drakx-backup-do-not-use-4405a8d65d909fbfe257fb99c0d13d2803fdd200.zip | |
Merging any.pm with ia64
| -rw-r--r-- | perl-install/any.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 1909261e2..ab9907cc7 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -138,6 +138,8 @@ sub setupBootloader { if_(exists $b->{methods}{lilo}, __("LILO with text menu") => sub { $b->{methods}{lilo} = "lilo-menu" }, __("LILO with graphical menu") => sub { $b->{methods}{lilo} = "lilo-graphic" }), + if_(exists $b->{methods}{elilo}, + __("ELILO") => sub { $b->{methods}{elilo} = 1 }), if_(exists $b->{methods}{grub}, #- put lilo if grub is chosen, so that /etc/lilo.conf is generated __("Grub") => sub { $b->{methods}{grub} = 1; @@ -284,13 +286,13 @@ You can add some more or change the existing ones."), my @l; if ($e->{type} eq "image") { @l = ( -{ label => _("Image"), val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") ], not_edit => 0 }, +{ label => _("Image"), val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_( arch() =~ /ia64/ ? "$prefix/boot/efi/vmlinuz*" : "$prefix/boot/vmlinuz*" ) ], not_edit => 0 }, { label => _("Root"), val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, { label => _("Append"), val => \$e->{append} }, if_(arch !~ /ppc|ia64/, { label => _("Video mode"), val => \$e->{vga}, list => [ keys %bootloader::vga_modes ], format => sub { $bootloader::vga_modes{$_[0]} }, not_edit => !$::expert }, ), -{ label => _("Initrd"), val => \$e->{initrd}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/initrd*") ], not_edit => 0 }, +{ label => _("Initrd"), val => \$e->{initrd}, list => [ map { s/$prefix//; $_ } glob_( arch() =~ /ia64/ ? "$prefix/boot/efi/initrd*" : "$prefix/boot/initrd*") ], not_edit => 0 }, { label => _("Read-write"), val => \$e->{'read-write'}, type => 'bool' } ); @l = @l[0..2] unless $::expert; |