From 9f0f880c31175e4941dde0c0facee61ca8b11ef4 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 21 Jan 2017 20:33:43 +0000 Subject: Don't treat Empty or BIOS_GRUB partitions as free space (mga#20074). The subroutine isEmpty() is used to identify free space on the disk (not DOS "Empty" partitions). Because we use a string to flag Empty and BIOS_GRUB partitions, rather than a numeric value, the numeric equality operator gives false positives. --- perl-install/fs/type.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index a6a53c83e..abfdb04e5 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -292,7 +292,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 isEmpty { !$_[0]{fs_type} && !$_[0]{pt_type} } sub isBIOS_GRUB { $_[0]{pt_type} eq 'BIOS_GRUB' } 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 } -- cgit v1.2.1