diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-06-30 04:15:44 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-02-10 23:07:48 +0100 |
| commit | 6945251db17abf6e8cf2946ec15af5739170b43f (patch) | |
| tree | 11e5c881f837504a354d55bc292fc8af307a86fd | |
| parent | eab082e82b0884602f8fae84aafe545c8825baf2 (diff) | |
| download | drakx-6945251db17abf6e8cf2946ec15af5739170b43f.tar drakx-6945251db17abf6e8cf2946ec15af5739170b43f.tar.gz drakx-6945251db17abf6e8cf2946ec15af5739170b43f.tar.bz2 drakx-6945251db17abf6e8cf2946ec15af5739170b43f.tar.xz drakx-6945251db17abf6e8cf2946ec15af5739170b43f.zip | |
(isESP) check fs too (mga#16246)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 7 insertions, 1 deletions
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) |