From d043433cefb6a98b2e039972f90398e9edd5d074 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 2 Dec 2016 21:02:51 +0000
Subject: Skip check for boot partitions when building Live images (mga#19516).

---
 perl-install/fs/any.pm        | 4 +++-
 perl-install/install/steps.pm | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 9dbda0eae..b47ac9f31 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -67,9 +67,11 @@ sub set_cdrom_symlink {
 }
 
 sub check_hds_boot_and_root {
-    my ($all_hds, $fstab) = @_;
+    my ($all_hds, $fstab, $o_match_all_hardware) = @_;
     fs::get::root_($fstab) or die "Oops, no root partition";
 
+    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");
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index aa3d6b4ec..f25ca4551 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});
+    fs::any::check_hds_boot_and_root($o->{all_hds}, $o->{fstab}, $o->{match_all_hardware});
 
     if ($o->{partitioning}{use_existing_root}) {
 	#- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat
-- 
cgit v1.2.1