| Branch | Commit message | Author | Age | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| master | Manage also Wayland session in MCC | Aurelian R | 2 months | ||||||||||||
| user/jibz/aarch64 | fix(install): grub2-efi was not found using default_bootloader() | Jybz | 10 months | ||||||||||||
| distro/mga9 | 18.66 | Martin Whitaker | 18 months | ||||||||||||
| user/pterjan/arm64 | foo | Pascal Terjan | 21 months | ||||||||||||
| distro/mga8 | drakxtools/stage2: 18.45: update NEWS | Thomas Backlund | 4 years | ||||||||||||
| distro/mga7 | 18.21.1 | Thomas Backlund | 6 years | ||||||||||||
| distro/mga6 | 17.88.3 | Martin Whitaker | 7 years | ||||||||||||
| topic/extlinux | bootloader: add cma=256M@512M for Raspberry Pi DRM/VC4 | Olivier Blin | 7 years | ||||||||||||
| topic/switching_to_dnf | perl-install/pkgs.pm: Port 'urpme' call to 'dnf remove' call | Neal Gompa | 7 years | ||||||||||||
| distro/mga5 | Fix the display of the clock in drakclock (mga#11776) | Frédéric Buclin | 8 years | ||||||||||||
| user/ennael/mga6 | - Add 60-block.rules in the installer (mga#20074) | Nicolas Lécureuil | 8 years | ||||||||||||
| user/martinw/mga6 | Always tell the kernel about partition table changes when running the classic... | Martin Whitaker | 8 years | ||||||||||||
| user/animtim/designWork | o do not modify /boot/vmlinuz symlinks before doing mkinitrd in case mkinitrd fails (#44862)|||||||||||||||
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index c4e3ed518..27ceb3b47 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- bootloader-config: + o do not modify /boot/vmlinuz symlinks before doing mkinitrd in case + mkinitrd fails (#44862) - diskdrake: o --nfs: handle "host:/" (#44320) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index f98e04405..dc5c1df58 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -709,18 +709,20 @@ sub add_kernel { $b_nolink ||= $kernel_str->{use_long_name}; my $vmlinuz_long = kernel_str2vmlinuz_long($kernel_str); + my $initrd_long = kernel_str2initrd_long($kernel_str); $v->{kernel_or_dev} = "/boot/$vmlinuz_long"; -e "$::prefix$v->{kernel_or_dev}" or log::l("unable to find kernel image $::prefix$v->{kernel_or_dev}"), return; - if (!$b_nolink) { - $v->{kernel_or_dev} = '/boot/' . kernel_str2vmlinuz_short($kernel_str); - _do_the_symlink($bootloader, $v->{kernel_or_dev}, $vmlinuz_long); - } log::l("adding $v->{kernel_or_dev}"); if (!$b_no_initrd) { - my $initrd_long = kernel_str2initrd_long($kernel_str); $v->{initrd} = mkinitrd($kernel_str->{version}, $bootloader, $v, "/boot/$initrd_long"); - if ($v->{initrd} && !$b_nolink) { + } + + if (!$b_nolink) { + $v->{kernel_or_dev} = '/boot/' . kernel_str2vmlinuz_short($kernel_str); + _do_the_symlink($bootloader, $v->{kernel_or_dev}, $vmlinuz_long); + + if ($v->{initrd}) { $v->{initrd} = '/boot/' . kernel_str2initrd_short($kernel_str); _do_the_symlink($bootloader, $v->{initrd}, $initrd_long); } |