diff options
| author | Thomas Backlund <tmb@mageia.org> | 2023-07-08 14:52:31 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2023-07-08 14:52:31 +0300 |
| commit | 5148e5dd535a4b3971353f3394030f62c4c4f215 (patch) | |
| tree | add96a8140b4a877bc52c73f918801477ac213b2 | |
| parent | c34b790ccb4b52b8f78128fff3f2221ef831e2da (diff) | |
| download | drakx-5148e5dd535a4b3971353f3394030f62c4c4f215.tar drakx-5148e5dd535a4b3971353f3394030f62c4c4f215.tar.gz drakx-5148e5dd535a4b3971353f3394030f62c4c4f215.tar.bz2 drakx-5148e5dd535a4b3971353f3394030f62c4c4f215.tar.xz drakx-5148e5dd535a4b3971353f3394030f62c4c4f215.zip | |
add ntfs3 to isFat_or_NTFS()
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 225afc2fb..baccb6cd1 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ - diskdrake: remove deprecated GtkPaned:handle-size style property (mga#32063) +- add ntfs3 to isFat_or_NTFS() Version 18.64 - 24 June 2023 diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 98497e1da..141d5b5e2 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -43,6 +43,7 @@ if_(arch() =~ /i.86|x86_64/, 0x0b => 'vfat', 'FAT32', 0x07 => 'ntfs-3g', 'NTFS-3G', 0x07 => 'ntfs', 'NTFS', + 0x07 => 'ntfs3', 'NTFS3', 0x07 => 'exfat', 'exFAT', ), ], @@ -314,7 +315,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}, qw(vfat ntfs ntfs-3g)) } +sub isFat_or_NTFS { member($_[0]{fs_type}, qw(vfat ntfs ntfs3 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} } |