summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/install/NEWS1
3 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 75aeebeab..bcaa94e96 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,7 @@
o it's now possible to set labels on exfat
- drakboot:
o do not try to enable non existing acpi service
+ o rename /boot/efi as /boot/EFI if needed (mga#22395)
- fix services::running_systemd()
- service_harddrake: recognise noxconf boot command line option
(disables creation of xorg.conf, allowing X server to configure itself)
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";
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b75421f89..8b1477c89 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- bootloader config:
o do not try to enable non existing acpi service
+ o rename /boot/efi as /boot/EFI if needed (mga#22395)
- partitioning:
o it's now possible to set labels on exfat
- select only once needed fs tools