Mageia Bugzilla – Attachment 9419 Details for
Bug 21104
Change EFI System Partition mountpoint from /boot/EFI to /boot/efi
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Git patch to change from /boot/EFI to /boot/efi
0001-Change-from-boot-EFI-to-boot-efi-mga-21104.patch (text/plain), 4.83 KB, created by
Neal Gompa
on 2017-06-17 15:52:34 CEST
(
hide
)
Description:
Git patch to change from /boot/EFI to /boot/efi
Filename:
MIME Type:
Creator:
Neal Gompa
Created:
2017-06-17 15:52:34 CEST
Size:
4.83 KB
patch
obsolete
>From 90f40be26bfcadffb94257dfb2bf464572c84718 Mon Sep 17 00:00:00 2001 >From: Neal Gompa <ngompa13@gmail.com> >Date: Sat, 17 Jun 2017 09:48:30 -0400 >Subject: [PATCH] Change from /boot/EFI to /boot/efi (mga#21104) > >--- > perl-install/NEWS | 1 + > perl-install/bootloader.pm | 2 +- > perl-install/fs/any.pm | 4 ++-- > perl-install/fs/mount_point.pm | 4 ++-- > perl-install/fs/partitioning_wizard.pm | 4 ++-- > perl-install/fs/type.pm | 2 +- > perl-install/fsedit.pm | 4 ++-- > 7 files changed, 11 insertions(+), 10 deletions(-) > >diff --git a/perl-install/NEWS b/perl-install/NEWS >index e6d9e714a..926107a08 100644 >--- a/perl-install/NEWS >+++ b/perl-install/NEWS >@@ -1,4 +1,5 @@ > - recognize 8812au (mga#21043) >+- Change from /boot/EFI to /boot/efi (mga#21104) > > Version 17.84 - 5 June 2017 > >diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm >index dc2863a44..5e5f5acc1 100644 >--- a/perl-install/bootloader.pm >+++ b/perl-install/bootloader.pm >@@ -263,7 +263,7 @@ sub read { > } > # still no boot loader found? let's check for ESP if using UEFI: > if (is_uefi()) { >- if (-f "/boot/EFI/EFI/mageia/grubx64.efi") { >+ if (-f "/boot/efi/EFI/mageia/grubx64.efi") { > my $bootloader = bootloader::read_grub2(); > return $bootloader if read_($bootloader); > } >diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm >index ba45c7bdc..3df88d667 100644 >--- a/perl-install/fs/any.pm >+++ b/perl-install/fs/any.pm >@@ -73,8 +73,8 @@ sub check_hds_boot_and_root { > return if $o_match_all_hardware; > > if (is_uefi()) { >- if (!fs::get::has_mntpoint("/boot/EFI", $all_hds)) { >- die N("You must have a ESP FAT32 partition mounted in /boot/EFI"); >+ if (!fs::get::has_mntpoint("/boot/efi", $all_hds)) { >+ die N("You must have a ESP FAT32 partition mounted in /boot/efi"); > } > } else { > # if we are doing an upgrade, the user may still be using a legacy bootloader >diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm >index 56f2405e9..ececd2d3e 100644 >--- a/perl-install/fs/mount_point.pm >+++ b/perl-install/fs/mount_point.pm >@@ -49,7 +49,7 @@ sub suggest_mount_points { > # reuse existing ESP under UEFI: > my @ESP = if_(is_uefi(), grep { isESP($_) } @$fstab); > if (@ESP) { >- $ESP[0]{mntpoint} = '/boot/EFI'; >+ $ESP[0]{mntpoint} = '/boot/efi'; > delete $ESP[0]{unsafeMntpoint}; > } > $_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach @$fstab; >@@ -60,7 +60,7 @@ sub suggest_mount_points_always { > > my @ESP = if_(is_uefi(), grep { isESP($_) && maybeFormatted($_) && !$_->{is_removable} } @$fstab); > if (@ESP) { >- $ESP[0]{mntpoint} = "/boot/EFI"; >+ $ESP[0]{mntpoint} = "/boot/efi"; > } > my @win = grep { isnormal_Fat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} } @$fstab; > log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; >diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm >index 8a15ec559..ebba04018 100644 >--- a/perl-install/fs/partitioning_wizard.pm >+++ b/perl-install/fs/partitioning_wizard.pm >@@ -72,9 +72,9 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return; > $ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?")); > } > if (is_uefi()) { >- my $part = fs::get::has_mntpoint("/boot/EFI", $all_hds); >+ my $part = fs::get::has_mntpoint("/boot/efi", $all_hds); > if (!$part || !isESP($part)) { >- $in->ask_warn('', N("You must have a ESP FAT32 partition mounted in /boot/EFI")); >+ $in->ask_warn('', N("You must have a ESP FAT32 partition mounted in /boot/efi")); > $ok = ''; > } > } else { >diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm >index 0492420e8..ac162cb0f 100644 >--- a/perl-install/fs/type.pm >+++ b/perl-install/fs/type.pm >@@ -393,7 +393,7 @@ sub directories_needed_to_boot_not_ESP() { > qw(/ /usr /var /boot /tmp); > } > sub directories_needed_to_boot() { >- directories_needed_to_boot_not_ESP(), '/boot/EFI'; >+ directories_needed_to_boot_not_ESP(), '/boot/efi'; > } > > sub carry_root_loopback { >diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm >index 2fcd1f1ee..49d2ce426 100644 >--- a/perl-install/fsedit.pm >+++ b/perl-install/fsedit.pm >@@ -50,11 +50,11 @@ sub init_mntpnt_suggestions { > $done++; > > my $mntpoint; >- # only suggests /boot/EFI if there's not already one: >+ # only suggests /boot/efi if there's not already one: > require fs::any; > if (is_uefi()) { > if (!any { isESP($_) } @$fstab) { >- $mntpoint = { mntpoint => "/boot/EFI", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) }; >+ $mntpoint = { mntpoint => "/boot/efi", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) }; > } > } > return if !$mntpoint; >-- >2.11.0 (Apple Git-81) >
From 90f40be26bfcadffb94257dfb2bf464572c84718 Mon Sep 17 00:00:00 2001 From: Neal Gompa <ngompa13@gmail.com> Date: Sat, 17 Jun 2017 09:48:30 -0400 Subject: [PATCH] Change from /boot/EFI to /boot/efi (mga#21104) --- perl-install/NEWS | 1 + perl-install/bootloader.pm | 2 +- perl-install/fs/any.pm | 4 ++-- perl-install/fs/mount_point.pm | 4 ++-- perl-install/fs/partitioning_wizard.pm | 4 ++-- perl-install/fs/type.pm | 2 +- perl-install/fsedit.pm | 4 ++-- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index e6d9e714a..926107a08 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ - recognize 8812au (mga#21043) +- Change from /boot/EFI to /boot/efi (mga#21104) Version 17.84 - 5 June 2017 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index dc2863a44..5e5f5acc1 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -263,7 +263,7 @@ sub read { } # still no boot loader found? let's check for ESP if using UEFI: if (is_uefi()) { - if (-f "/boot/EFI/EFI/mageia/grubx64.efi") { + if (-f "/boot/efi/EFI/mageia/grubx64.efi") { my $bootloader = bootloader::read_grub2(); return $bootloader if read_($bootloader); } diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm index ba45c7bdc..3df88d667 100644 --- a/perl-install/fs/any.pm +++ b/perl-install/fs/any.pm @@ -73,8 +73,8 @@ sub check_hds_boot_and_root { return if $o_match_all_hardware; if (is_uefi()) { - if (!fs::get::has_mntpoint("/boot/EFI", $all_hds)) { - die N("You must have a ESP FAT32 partition mounted in /boot/EFI"); + if (!fs::get::has_mntpoint("/boot/efi", $all_hds)) { + die N("You must have a ESP FAT32 partition mounted in /boot/efi"); } } else { # if we are doing an upgrade, the user may still be using a legacy bootloader diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index 56f2405e9..ececd2d3e 100644 --- a/perl-install/fs/mount_point.pm +++ b/perl-install/fs/mount_point.pm @@ -49,7 +49,7 @@ sub suggest_mount_points { # reuse existing ESP under UEFI: my @ESP = if_(is_uefi(), grep { isESP($_) } @$fstab); if (@ESP) { - $ESP[0]{mntpoint} = '/boot/EFI'; + $ESP[0]{mntpoint} = '/boot/efi'; delete $ESP[0]{unsafeMntpoint}; } $_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach @$fstab; @@ -60,7 +60,7 @@ sub suggest_mount_points_always { my @ESP = if_(is_uefi(), grep { isESP($_) && maybeFormatted($_) && !$_->{is_removable} } @$fstab); if (@ESP) { - $ESP[0]{mntpoint} = "/boot/EFI"; + $ESP[0]{mntpoint} = "/boot/efi"; } my @win = grep { isnormal_Fat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} } @$fstab; log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 8a15ec559..ebba04018 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -72,9 +72,9 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return; $ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?")); } if (is_uefi()) { - my $part = fs::get::has_mntpoint("/boot/EFI", $all_hds); + my $part = fs::get::has_mntpoint("/boot/efi", $all_hds); if (!$part || !isESP($part)) { - $in->ask_warn('', N("You must have a ESP FAT32 partition mounted in /boot/EFI")); + $in->ask_warn('', N("You must have a ESP FAT32 partition mounted in /boot/efi")); $ok = ''; } } else { diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 0492420e8..ac162cb0f 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -393,7 +393,7 @@ sub directories_needed_to_boot_not_ESP() { qw(/ /usr /var /boot /tmp); } sub directories_needed_to_boot() { - directories_needed_to_boot_not_ESP(), '/boot/EFI'; + directories_needed_to_boot_not_ESP(), '/boot/efi'; } sub carry_root_loopback { diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 2fcd1f1ee..49d2ce426 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -50,11 +50,11 @@ sub init_mntpnt_suggestions { $done++; my $mntpoint; - # only suggests /boot/EFI if there's not already one: + # only suggests /boot/efi if there's not already one: require fs::any; if (is_uefi()) { if (!any { isESP($_) } @$fstab) { - $mntpoint = { mntpoint => "/boot/EFI", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) }; + $mntpoint = { mntpoint => "/boot/efi", size => MB(100), pt_type => 0xef, ratio => 1, maxsize => MB(300) }; } } return if !$mntpoint; -- 2.11.0 (Apple Git-81)
View Attachment As Raw
Actions:
View
Attachments on
bug 21104
: 9419