summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-03-23 18:17:07 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-05-01 02:42:26 +0200
commit9ca4009fc810fd8ef4825c5e5cc7ad8d745cf279 (patch)
treecad4e44f00a0e1f9f84b1aa16ce546d0dcbaf9de /perl-install/bootloader.pm
parentea72e206bd6ab2cb5fbe15340c0cde9cf04d5db2 (diff)
downloaddrakx-9ca4009fc810fd8ef4825c5e5cc7ad8d745cf279.tar
drakx-9ca4009fc810fd8ef4825c5e5cc7ad8d745cf279.tar.gz
drakx-9ca4009fc810fd8ef4825c5e5cc7ad8d745cf279.tar.bz2
drakx-9ca4009fc810fd8ef4825c5e5cc7ad8d745cf279.tar.xz
drakx-9ca4009fc810fd8ef4825c5e5cc7ad8d745cf279.zip
(install_raw_grub2) rename /boot/efi as /boot/EFI
Mageia mounts the ESP as /boot/EFI and thes grub2 looks at /boot/EFI/EFI But some windows installation end in having /boot/EFI/efi (lowercase) Rename the directory as upercase if needed so that grub2-install doesn't fail (mga#22395)
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index e7b6eab5d..4eedc6f04 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2334,6 +2334,10 @@ sub install_grub2 {
sub install_raw_grub2() {
my $error;
my $f = '/boot/grub2/install.sh';
+ my ($right_dir, $bad_dir) = ("$::prefix/boot/EFI/EFI/", "$::prefix/boot/EFI/efi/");
+ if (-e $bad_dir && ! -e $right_dir) {
+ renamef($bad_dir, $right_dir);
+ }
if (!run_program::rooted($::prefix, "sh", "2>", \$error, $f)) {
log::explanations("grub2-install failed:\n(" . cat_($f) . ")\nError: <$error>");
die "grub2-install failed: $error";