summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-16 14:34:58 +0100
committerThomas Backlund <tmb@mageia.org>2015-03-20 21:09:23 +0159
commit34ac8b909e949012b64706a88937304b32ba76e9 (patch)
tree8125589a48a93ffdaca2635b285bfbe5b1b4d35a
parent36b1847932bee82c10406dd51627c92a347ca1f3 (diff)
downloaddrakx-34ac8b909e949012b64706a88937304b32ba76e9.tar
drakx-34ac8b909e949012b64706a88937304b32ba76e9.tar.gz
drakx-34ac8b909e949012b64706a88937304b32ba76e9.tar.bz2
drakx-34ac8b909e949012b64706a88937304b32ba76e9.tar.xz
drakx-34ac8b909e949012b64706a88937304b32ba76e9.zip
(isEfi) rename as isESP()
as it really checks for ESP System Partition
-rw-r--r--perl-install/fs/type.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 29f9a6f3b..be47cf00c 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 isEfi { $_[0]{pt_type} == 0xef }
+sub isESP { $_[0]{pt_type} == 0xef }
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' }
@@ -313,7 +313,7 @@ sub isRecovery {
sub isTrueFS { isTrueLocalFS($_[0]) || member($_[0]{fs_type}, qw(nfs)) }
sub isTrueLocalFS { member($_[0]{fs_type}, true_local_fs_types()) }
-sub isOtherAvailableFS { isEfi($_[0]) || isFat_or_NTFS($_[0]) || member($_[0]{fs_type}, 'ufs', 'hfs', 'iso9660') } #- other OS that linux can access its filesystem
+sub isOtherAvailableFS { isESP($_[0]) || isFat_or_NTFS($_[0]) || member($_[0]{fs_type}, 'ufs', 'hfs', 'iso9660') } #- other OS that linux can access its filesystem
sub isMountableRW { (isTrueFS($_[0]) || isOtherAvailableFS($_[0])) && $_[0]{fs_type} ne 'ntfs' }
sub cannotBeMountable {
my ($part) = @_;