Attachment 6790 Details for Bug 16246 – stricter check for ESP (untested)

[patch] stricter check for ESP (untested)

16246.diff (text/plain), 1.01 KB, created by Thierry Vignaud on 2015-06-30 10:14:54 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-06-30 10:14:54 CEST

Size: 1.01 KB

patch

obsolete

>commit a66091e6bd0d852fb56fa5335f2f34f608afaaf7
>Author: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date:   Tue Jun 30 04:13:15 2015 -0400
>
>    check that ESP mount point actually is an ESP
>    
>    fixing grub2 faillure resulting in draklive-install crash (mga#16246)
>
>diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
>index ebc97ae..16f0d6b 100644
>--- a/perl-install/fs/partitioning_wizard.pm
>+++ b/perl-install/fs/partitioning_wizard.pm
>@@ -71,9 +71,12 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return;
> 	if (!any { isSwap($_) } @fstab) {
> 	    $ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?"));
> 	}
>-	if (is_uefi() && !fs::get::has_mntpoint("/boot/EFI", $all_hds)) {
>+	if (is_uefi()) {
>+	  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"));
> 	    $ok = '';
>+	  }
> 	}
>     } until $ok;
>     1;

commit a66091e6bd0d852fb56fa5335f2f34f608afaaf7
Author: Thierry Vignaud <thierry.vignaud@gmail.com>
Date:   Tue Jun 30 04:13:15 2015 -0400

    check that ESP mount point actually is an ESP
    
    fixing grub2 faillure resulting in draklive-install crash (mga#16246)

diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index ebc97ae..16f0d6b 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -71,9 +71,12 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return;
 	if (!any { isSwap($_) } @fstab) {
 	    $ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?"));
 	}
-	if (is_uefi() && !fs::get::has_mntpoint("/boot/EFI", $all_hds)) {
+	if (is_uefi()) {
+	  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"));
 	    $ok = '';
+	  }
 	}
     } until $ok;
     1;

Actions: View | Diff

Attachments on bug 16246: 6790 | 6791