diff options
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index d1994d2c9..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; @@ -396,8 +398,8 @@ sub writeandclean_ldsoconf { my ($prefix) = @_; my $file = "$prefix/etc/ld.so.conf"; output $file, - grep { !m|^(/usr)?/lib$| } #- no need to have /lib and /usr/lib in ld.so.conf - uniq cat_($file), "/usr/X11R6/lib\n"; + grep { !m|^(/usr)?/lib(64)?$| } #- no need to have /lib and /usr/lib in ld.so.conf + uniq cat_($file), (if_(arch() =~ /x86_64/, "/usr/X11R6/lib64\n"), "/usr/X11R6/lib\n"); } sub shells { |