diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2001-11-30 09:14:45 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2001-11-30 09:14:45 +0000 |
| commit | 66b43a2a2d7a4a016263798fecd3f794ddb23671 (patch) | |
| tree | f62ab3829193b29efc4191a508111fa5a82bdbca | |
| parent | 61b5307bfdd85a3c95b1c2813f2bcfa043856a6b (diff) | |
| download | drakx-66b43a2a2d7a4a016263798fecd3f794ddb23671.tar drakx-66b43a2a2d7a4a016263798fecd3f794ddb23671.tar.gz drakx-66b43a2a2d7a4a016263798fecd3f794ddb23671.tar.bz2 drakx-66b43a2a2d7a4a016263798fecd3f794ddb23671.tar.xz drakx-66b43a2a2d7a4a016263798fecd3f794ddb23671.zip | |
- Don't forget to link the initrd to the real image in /boot/efi/ tootopic/ia64-8_1
- Remove DEBUG printouts in install_efi_boot_menu
| -rw-r--r-- | perl-install/bootloader.pm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index f28c61f06..36d18be57 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -154,8 +154,11 @@ sub add_kernel($$$$$) { my $f = "initrd-$kernelVersion$specific.img"; eval { mkinitrd($prefix, "$kernelVersion$specific", (arch() =~ /ia64/ ? "/boot/efi" : "/boot") . "/$f") }; undef $initrdImage if $@; - symlinkf $f, "$prefix$initrdImage" or $initrdImage = "/boot/$f" - if $initrdImage; + if ($initrdImage) { + symlinkf $f, "$prefix$initrdImage" or $initrdImage = "/boot/$f"; + #- Don't forget to link the initrd to the real image in /boot/efi/ too + symlinkf "efi/$f", "$prefix/boot/$f" if (arch() =~ /ia64/); + } } symlinkf "$vmlinuz", "$prefix/$image" or $image = "/boot/$vmlinuz"; #- On IA-64, kernels and initrd are now always in /boot/efi with the bootloader (elilo) @@ -777,8 +780,8 @@ sub install_efi_boot_menu { #- get boot disk and partition my $part = fsedit::mntpoint2part "/boot/efi", $fstab; (my ($bootdisk, $bootpart) = ($1, $2)) = ("/dev/" . $part->{device}) =~ m|(/dev/.+)([0-9]+)|; - print STDERR "DEBUG: boot-disk = $bootdisk\n"; - print STDERR "DEBUG: boot-partition = $bootpart\n"; + # print STDERR "DEBUG: boot-disk = $bootdisk\n"; + # print STDERR "DEBUG: boot-partition = $bootpart\n"; die "empty bootdisk or bootpart variables" if !($bootdisk) || !($bootpart); #- delete other entries with name "Mandrake Linux" |