Attachment 6565 Details for Bug 15962 – fix regression refusing FAT for ESP (mga#15962)

[patch] fix regression refusing FAT for ESP (mga#15962)

15962.diff (text/plain), 1.56 KB, created by Thierry Vignaud on 2015-05-17 11:00:13 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-05-17 11:00:13 CEST

Size: 1.56 KB

patch

obsolete

>commit 6404500d0a57715e351ba7a6945a389a7e4f44ad
>Author: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date:   Sun May 17 10:57:00 2015 +0200
>
>    fix regression refusing FAT for ESP (mga#15962)
>
>diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
>index e1df877..c3053a2 100644
>--- a/perl-install/fs/type.pm
>+++ b/perl-install/fs/type.pm
>@@ -375,8 +375,11 @@ sub guessed_by_mount() {
>     grep { $_ && !/nodev/ } chomp_(cat_('/etc/filesystems'));
> }
> 
>+sub directories_needed_to_boot_not_ESP() {
>+    qw(/ /usr /var /boot /tmp);
>+}
> sub directories_needed_to_boot() { 
>-    qw(/ /usr /var /boot /boot/EFI /tmp);
>+    directories_needed_to_boot_not_ESP(), '/boot/EFI';
> }
> 
> sub carry_root_loopback {
>diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
>index 4b56338..edb2392 100644
>--- a/perl-install/fsedit.pm
>+++ b/perl-install/fsedit.pm
>@@ -489,7 +489,7 @@ You should create a separate /boot partition first") if $mntpoint eq "/" && isLV
>     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
>       if !isTrueLocalFS($part) && $mntpoint eq '/';
>     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n") . $mntpoint
>-      if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot());
>+      if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot_not_ESP());
>     die N("You cannot use an encrypted filesystem for mount point %s", $mntpoint)
>       if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));
>

commit 6404500d0a57715e351ba7a6945a389a7e4f44ad
Author: Thierry Vignaud <thierry.vignaud@gmail.com>
Date:   Sun May 17 10:57:00 2015 +0200

    fix regression refusing FAT for ESP (mga#15962)

diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index e1df877..c3053a2 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -375,8 +375,11 @@ sub guessed_by_mount() {
     grep { $_ && !/nodev/ } chomp_(cat_('/etc/filesystems'));
 }
 
+sub directories_needed_to_boot_not_ESP() {
+    qw(/ /usr /var /boot /tmp);
+}
 sub directories_needed_to_boot() { 
-    qw(/ /usr /var /boot /boot/EFI /tmp);
+    directories_needed_to_boot_not_ESP(), '/boot/EFI';
 }
 
 sub carry_root_loopback {
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 4b56338..edb2392 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -489,7 +489,7 @@ You should create a separate /boot partition first") if $mntpoint eq "/" && isLV
     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
       if !isTrueLocalFS($part) && $mntpoint eq '/';
     die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n") . $mntpoint
-      if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot());
+      if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot_not_ESP());
     die N("You cannot use an encrypted filesystem for mount point %s", $mntpoint)
       if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));

Actions: View | Diff

Attachments on bug 15962: 6564 | 6565