summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-05-23 08:56:34 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-05-23 08:56:34 +0000
commit6c0421d4d9a84c9753697404079758cc917731b1 (patch)
treeb8879424035ec02650c3cc60a619ae3e55e3fb48
parenta6435295318c886beb328f5683c0d7b0b80922bb (diff)
downloaddrakx-6c0421d4d9a84c9753697404079758cc917731b1.tar
drakx-6c0421d4d9a84c9753697404079758cc917731b1.tar.gz
drakx-6c0421d4d9a84c9753697404079758cc917731b1.tar.bz2
drakx-6c0421d4d9a84c9753697404079758cc917731b1.tar.xz
drakx-6c0421d4d9a84c9753697404079758cc917731b1.zip
Kernel and initrd are now in /boot/efi/mandrake on IA-64
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/bootloader.pm14
2 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ab9907cc7..bc6f2fe76 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -286,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_( arch() =~ /ia64/ ? "$prefix/boot/efi/vmlinuz*" : "$prefix/boot/vmlinuz*" ) ], not_edit => 0 },
+{ label => _("Image"), val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_( arch() =~ /ia64/ ? "$prefix/boot/efi/mandrake/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_( arch() =~ /ia64/ ? "$prefix/boot/efi/initrd*" : "$prefix/boot/initrd*") ], not_edit => 0 },
+{ label => _("Initrd"), val => \$e->{initrd}, list => [ map { s/$prefix//; $_ } glob_( arch() =~ /ia64/ ? "$prefix/boot/efi/mandrake/initrd*" : "$prefix/boot/initrd*") ], not_edit => 0 },
{ label => _("Read-write"), val => \$e->{'read-write'}, type => 'bool' }
);
@l = @l[0..2] unless $::expert;
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 30d3964fe..9fd22112e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -193,9 +193,9 @@ sub add_kernel {
$ext = "-$version";
}
- # If itanium architecture store kernel & initrd in /boot/efi
+ # If itanium architecture store kernel & initrd in /boot/efi/mandrake
if (arch() =~ /ia64/) {
- $boot="/boot/efi";
+ $boot="/boot/efi/mandrake";
}
log::l("adding vmlinuz$ext as vmlinuz-$version");
@@ -283,7 +283,7 @@ sub configure_entry {
my $boot="/boot/";
if (arch() =~ /ia64/) {
- $boot="/boot/efi";
+ $boot="/boot/efi/mandrake";
}
$entry->{kernel_or_dev} =~ /vmlinu.-(.*)/ and $specific_version = $1;
@@ -308,7 +308,7 @@ sub dev2prompath { #- SPARC only
sub get_kernels_and_labels() {
my $dir = "$::prefix/boot";
if ( arch() =~ /ia64/ ) {
- $dir = "$::prefix/boot/efi"; }
+ $dir = "$::prefix/boot/efi/mandrake"; }
my @l = grep { /^vmlinuz-/ } all($dir);
my @kernels = grep { ! -l "$dir/$_" } @l;
@@ -819,7 +819,7 @@ sub write_lilo_conf {
{
local *F;
local $\ = "\n";
- my $f = arch() =~ /ia64/ ? "$::prefix/boot/efi/elilo.conf" : "$::prefix/etc/lilo.conf";
+ my $f = arch() =~ /ia64/ ? "$::prefix/boot/efi/mandrake/elilo.conf" : "$::prefix/etc/lilo.conf";
open F, ">$f" or die "cannot create lilo config file: $f";
log::l("writing lilo config to $f");
@@ -899,14 +899,14 @@ sub write_elilo_conf {
my $file2fullname = sub {
my ($file) = @_;
- $file =~ s|/boot/efi/||;
+ $file =~ s|/boot/efi/mandrake/||;
$file
};
{
local *F;
local $\ = "\n";
- my $f = "$prefix/boot/efi/elilo.conf";
+ my $f = "$prefix/boot/efi/mandrake/elilo.conf";
open F, ">$f" or die "cannot create lilo config file: $f";
log::l("writing elilo config to $f");