summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-10-16 07:57:18 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-10-16 11:18:52 +0200
commit4d6e37a9a982f3068ff587f05a6a4fa5073c13a1 (patch)
treea48ebbb9400716c3aef3eb2c0988b1b3e7887785 /perl-install
parent84b4c77879dd6a36b90e9cc9f704b7022bd669ef (diff)
downloaddrakx-4d6e37a9a982f3068ff587f05a6a4fa5073c13a1.tar
drakx-4d6e37a9a982f3068ff587f05a6a4fa5073c13a1.tar.gz
drakx-4d6e37a9a982f3068ff587f05a6a4fa5073c13a1.tar.bz2
drakx-4d6e37a9a982f3068ff587f05a6a4fa5073c13a1.tar.xz
drakx-4d6e37a9a982f3068ff587f05a6a4fa5073c13a1.zip
simplify
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/fs/type.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 2451df253..a7e740546 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1213,7 +1213,7 @@ sub suggest {
#- search for dos (or windows) boot partition. Do not look in extended partitions!
my @windows_boot_parts =
grep { $_->{active}
- && isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs', 'ntfs-3g')
+ && isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), qw(vfat ntfs ntfs-3g))
&& !$_->{is_removable}
&& !isRecovery($_);
}
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index c38e9e497..679525774 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -302,7 +302,7 @@ sub isRawRAID { $_[0]{pt_type} == 0xfd || $_[0]{type_name} eq 'Linux RAID' }
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 isFat_or_NTFS { member($_[0]{fs_type}, qw(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} }