Attachment 6791 Details for Bug 16246 – check fs type too (untested)

[patch] check fs type too (untested)

16246b.diff (text/plain), 877 bytes, created by Thierry Vignaud on 2015-06-30 10:16:34 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-06-30 10:16:34 CEST

Size: 877 bytes

patch

obsolete

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

    (isESP) check fs too (mga#16246)

diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index b5b4b36..ef296fa 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -291,7 +291,7 @@ sub defaultFS() { 'ext4' }
 sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 reiserfs xfs jfs) }
 
 sub isEmpty { !$_[0]{fs_type} && $_[0]{pt_type} == 0 }
-sub isESP { $_[0]{pt_type} == 0xef }
+sub isESP { $_[0]{pt_type} == 0xef && $_[0]{fs_type} eq 'vfat' }
 sub isExtended { $_[0]{pt_type} == 5 || $_[0]{pt_type} == 0xf || $_[0]{pt_type} == 0x85 }
 sub isRawLVM { $_[0]{pt_type} == 0x8e || $_[0]{type_name} eq 'Linux Logical Volume Manager' }
 sub isRawRAID { $_[0]{pt_type} == 0xfd || $_[0]{type_name} eq 'Linux RAID' }

Actions: View | Diff

Attachments on bug 16246: 6790 | 6791