diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-18 16:06:22 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-18 16:15:44 +0200 |
| commit | 249e1e6c2d48237221d87485cafd179d46082361 (patch) | |
| tree | 7996bded20b939b76d87d6a3365beb25facb244a | |
| parent | 45f66a9b8d156534d9af155d48d0c7c96b6cac81 (diff) | |
| download | drakx-249e1e6c2d48237221d87485cafd179d46082361.tar drakx-249e1e6c2d48237221d87485cafd179d46082361.tar.gz drakx-249e1e6c2d48237221d87485cafd179d46082361.tar.bz2 drakx-249e1e6c2d48237221d87485cafd179d46082361.tar.xz drakx-249e1e6c2d48237221d87485cafd179d46082361.zip | |
add a failsafe for ESP tagging
sometimes we end with bogus 'fat32' fs
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b2ad91b4d..8a3527d0a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix ESP tagging in some cases + Version 17.38 - 16 June 2016 - diskdrake: diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index f4ca32238..b8262b30e 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -293,7 +293,7 @@ sub true_local_fs_types() { qw(btrfs ext3 ext2 ext4 reiserfs xfs jfs) } sub isEmpty { !$_[0]{fs_type} && $_[0]{pt_type} == 0 } sub isBIOS_GRUB { $_[0]{pt_type} == 'BIOS_GRUB' } -sub isESP { $_[0]{pt_type} == 0xef && $_[0]{fs_type} eq 'vfat' } +sub isESP { $_[0]{pt_type} == 0xef && member($_[0]{fs_type}, qw(fat32 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 f3f7719a6..dfc33cc99 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- partionning: + o fix ESP tagging in some cases - services: o update service category lists |