summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-02-25 21:01:34 +0000
committerRĂ©mi Verschelde <rverschelde@gmail.com>2017-04-04 20:03:30 +0200
commit6753abe33da73245f22908724f671334de56cd09 (patch)
tree4c3f71b54fc11612e3eb0bb47aacd9b4e8495598 /perl-install/fs
parent061f1e2f459db1ed0e1ddd4f332cf270626e32c3 (diff)
downloaddrakx-6753abe33da73245f22908724f671334de56cd09.tar
drakx-6753abe33da73245f22908724f671334de56cd09.tar.gz
drakx-6753abe33da73245f22908724f671334de56cd09.tar.bz2
drakx-6753abe33da73245f22908724f671334de56cd09.tar.xz
drakx-6753abe33da73245f22908724f671334de56cd09.zip
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.
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/any.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index d2fea55ee..ba45c7bdc 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.");
}