Attachment 8482 Details for Bug 19516 – Proposed fix.

Proposed fix.

0001-Skip-check-for-boot-partitions-when-building-Live-im.patch (text/plain), 1.35 KB, created by Martin Whitaker on 2016-10-03 22:05:39 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2016-10-03 22:05:39 CEST

Size: 1.35 KB

patch

obsolete

>From 0798a13eb2bacc2b6e4a17a0074c212e131dfa29 Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mageia@martin-whitaker.me.uk>
>Date: Mon, 3 Oct 2016 20:33:45 +0100
>Subject: [PATCH] Skip check for boot partitions when building Live images.
>
>
>diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
>index 9dbda0e..1b08589 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, $match_all_hardware) = @_;
>     fs::get::root_($fstab) or die "Oops, no root partition";
> 
>+    return if $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 aa3d6b4..f25ca45 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
>-- 
>2.7.4

From 0798a13eb2bacc2b6e4a17a0074c212e131dfa29 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 3 Oct 2016 20:33:45 +0100
Subject: [PATCH] Skip check for boot partitions when building Live images.


diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 9dbda0e..1b08589 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, $match_all_hardware) = @_;
     fs::get::root_($fstab) or die "Oops, no root partition";
 
+    return if $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 aa3d6b4..f25ca45 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
-- 
2.7.4

Actions: View

Attachments on bug 19516: 8482