Mageia Bugzilla – Attachment 8988 Details for
Bug 20338
On Mga5 to Mga6 upgrade a bios_boot partition in being required if disk is gpt.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Proposed fix
0001-Don-t-require-a-BIOS-boot-partition-when-performing-.patch (text/plain), 2.00 KB, created by
Martin Whitaker
on 2017-02-25 22:17:29 CET
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Martin Whitaker
Created:
2017-02-25 22:17:29 CET
Size:
2.00 KB
patch
obsolete
>From 33a20b785ec03884a41ccbbf2448f835ac831752 Mon Sep 17 00:00:00 2001 >From: Martin Whitaker <mageia@martin-whitaker.me.uk> >Date: Sat, 25 Feb 2017 21:01:34 +0000 >Subject: [PATCH] Don't require a BIOS boot partition when performing an > upgrade (mga#20338) > >If we are upgrading a system on a GPT disk and it doesn't currently >have a BIOS boot partition, the old system must be using a legacy >bootloader (e.g. grub). We support the continued use of legacy >bootloaders in an upgrade, so there is no need to insist on a BIOS >boot partition in this case. > >diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm >index d2fea55..ba45c7b 100644 >--- a/perl-install/fs/any.pm >+++ b/perl-install/fs/any.pm >@@ -67,7 +67,7 @@ sub set_cdrom_symlink { > } > > sub check_hds_boot_and_root { >- my ($all_hds, $fstab, $o_match_all_hardware) = @_; >+ my ($all_hds, $fstab, $isUpgrade, $o_match_all_hardware) = @_; > fs::get::root_($fstab) or die "Oops, no root partition"; > > return if $o_match_all_hardware; >@@ -77,6 +77,8 @@ sub check_hds_boot_and_root { > 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 >+ return if $isUpgrade; > if (is_boot_bios_part_needed($all_hds)) { > die N("You must have a BIOS boot partition for non-UEFI GPT-partitioned disks. Please create one before continuing."); > } >diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm >index f25ca45..7d3a5a6 100644 >--- a/perl-install/install/steps.pm >+++ b/perl-install/install/steps.pm >@@ -201,7 +201,7 @@ sub doPartitionDisksAfter { > $part->{isMounted} = 1; > } > >- fs::any::check_hds_boot_and_root($o->{all_hds}, $o->{fstab}, $o->{match_all_hardware}); >+ fs::any::check_hds_boot_and_root($o->{all_hds}, $o->{fstab}, $o->{isUpgrade}, $o->{match_all_hardware}); > > if ($o->{partitioning}{use_existing_root}) { > #- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat >-- >2.10.2 >
From 33a20b785ec03884a41ccbbf2448f835ac831752 Mon Sep 17 00:00:00 2001 From: Martin Whitaker <mageia@martin-whitaker.me.uk> Date: Sat, 25 Feb 2017 21:01:34 +0000 Subject: [PATCH] Don't require a BIOS boot partition when performing an upgrade (mga#20338) If we are upgrading a system on a GPT disk and it doesn't currently have a BIOS boot partition, the old system must be using a legacy bootloader (e.g. grub). We support the continued use of legacy bootloaders in an upgrade, so there is no need to insist on a BIOS boot partition in this case. diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm index d2fea55..ba45c7b 100644 --- a/perl-install/fs/any.pm +++ b/perl-install/fs/any.pm @@ -67,7 +67,7 @@ sub set_cdrom_symlink { } sub check_hds_boot_and_root { - my ($all_hds, $fstab, $o_match_all_hardware) = @_; + my ($all_hds, $fstab, $isUpgrade, $o_match_all_hardware) = @_; fs::get::root_($fstab) or die "Oops, no root partition"; return if $o_match_all_hardware; @@ -77,6 +77,8 @@ sub check_hds_boot_and_root { 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 + return if $isUpgrade; if (is_boot_bios_part_needed($all_hds)) { die N("You must have a BIOS boot partition for non-UEFI GPT-partitioned disks. Please create one before continuing."); } diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index f25ca45..7d3a5a6 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -201,7 +201,7 @@ sub doPartitionDisksAfter { $part->{isMounted} = 1; } - fs::any::check_hds_boot_and_root($o->{all_hds}, $o->{fstab}, $o->{match_all_hardware}); + fs::any::check_hds_boot_and_root($o->{all_hds}, $o->{fstab}, $o->{isUpgrade}, $o->{match_all_hardware}); if ($o->{partitioning}{use_existing_root}) { #- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat -- 2.10.2
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 20338
:
8980
| 8988