From 06ee50b237dccb9411d589ddcb35ac2a8ca1771a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 3 Mar 2008 21:05:56 +0000
Subject: - use and install ntfs-3g by default for ntfs partitions (#37823)

---
 perl-install/fs/type.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'perl-install/fs')

diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 166e079a9..e4cf4503b 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -31,8 +31,8 @@ if_(arch() =~ /ppc|i.86|x86_64/,
 ),
 if_(arch() =~ /i.86|ia64|x86_64/,
   0x0b => 'vfat',     'FAT32',
-  0x07 => 'ntfs',     'NTFS',
   0x07 => 'ntfs-3g',  'NTFS-3G',
+  0x07 => 'ntfs',     'NTFS',
 ),
 if_(arch() =~ /ppc/,
   0x401	=> '',         'Apple Bootstrap',
@@ -291,8 +291,9 @@ sub type_subpart_from_magic {
 	}->{$ids->{ID_FS_TYPE}};
 
 	$p = type_name2subpart($name) if $name;
-    } elsif ($ids->{ID_FS_TYPE}) {
-	$p = fs_type2subpart($ids->{ID_FS_TYPE}) or log::l("unknown filesystem $ids->{ID_FS_TYPE} returned by vol_id");
+    } elsif (my $fs_type = $ids->{ID_FS_TYPE}) {
+	$fs_type = 'ntfs-3g' if $fs_type eq 'ntfs';
+	$p = fs_type2subpart($fs_type) or log::l("unknown filesystem $fs_type returned by vol_id");
     }
 
     if ($p) {
-- 
cgit v1.2.1