From 6945251db17abf6e8cf2946ec15af5739170b43f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 30 Jun 2015 04:15:44 -0400
Subject: (isESP) check fs too (mga#16246)

---
 perl-install/NEWS         | 3 +++
 perl-install/fs/type.pm   | 2 +-
 perl-install/install/NEWS | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0bf7834f7..4eba2289a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- library (for draklive-install):
+  o check ESP has the right fs type (mga#16246)
+
 Version 17.16 - 25 January 2016
 
 - detect_devices:
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index b5b4b36f7..ef296fa53 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' }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 7a195ec84..5f44132c5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- partionning:
+  o check ESP has the right fs type (mga#16246)
+
 Version 17.17 - 29 January 2016
 
 - fix hidden cursor (mga#17470)
-- 
cgit v1.2.1