summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-10 17:25:45 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-12 22:54:58 +0200
commit12ed7fa3856e828100e8ced0a52800fb37124fff (patch)
treef9f5fef7fee46a9335b8e7cfb207e21683f50f90
parentfb1aa950f8a70e05c123a48bcab369465037cb0f (diff)
downloaddrakx-12ed7fa3856e828100e8ced0a52800fb37124fff.tar
drakx-12ed7fa3856e828100e8ced0a52800fb37124fff.tar.gz
drakx-12ed7fa3856e828100e8ced0a52800fb37124fff.tar.bz2
drakx-12ed7fa3856e828100e8ced0a52800fb37124fff.tar.xz
drakx-12ed7fa3856e828100e8ced0a52800fb37124fff.zip
(isnormal_Fat_or_NTFS) introduce it
returns regular FAT/NTFS (eg: no recovery, no ESP, ...)
-rw-r--r--perl-install/fs/type.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 264b89964..06992c936 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -9,7 +9,7 @@ use devices;
our @ISA = qw(Exporter);
our @EXPORT = qw(
- isEmpty isExtended isTrueLocalFS isTrueFS isDos isSwap isOtherAvailableFS isRawLVM isRawRAID isRawLUKS isRAID isLVM isLUKS isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isLoopback isMounted isBusy isSpecial isApple isAppleBootstrap isESP isFat_or_NTFS isRecovery
+ isEmpty isExtended isTrueLocalFS isTrueFS isDos isSwap isOtherAvailableFS isRawLVM isRawRAID isRawLUKS isRAID isLVM isLUKS isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isLoopback isMounted isBusy isSpecial isApple isAppleBootstrap isESP isFat_or_NTFS isnormal_Fat_or_NTFS isRecovery
maybeFormatted set_isFormatted defaultFS
);
@@ -299,6 +299,7 @@ sub isRawLUKS { $_[0]{type_name} eq 'Encrypted' }
sub isSwap { $_[0]{fs_type} eq 'swap' }
sub isDos { ${{ 1 => 1, 4 => 1, 6 => 1 }}{$_[0]{pt_type}} }
sub isFat_or_NTFS { member($_[0]{fs_type}, 'vfat', 'ntfs', 'ntfs-3g') }
+sub isnormal_Fat_or_NTFS { grep { isFat_or_NTFS($_) && !isESP($_) && !isRecovery($_) } @_ }
sub isApple { $_[0]{pt_type} == 0x401 && defined $_[0]{isDriver} }
sub isAppleBootstrap { $_[0]{pt_type} == 0x401 && defined $_[0]{isBoot} }
sub isRecovery {