4 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 636cf78ee..85547821b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
 - adapt to new kernel-2.6.25's sysfs layout (Eric Pielbug, #38235)
+- diskdrake: use ntfs-3g by default for ntfs partitions
 - select proper padlock module for Via CPU (#38311)
 
 Version 10.7 - 3 March 2008
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) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b4d618471..1bc223dff 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
   Core by the way)
 - auto allocate: do not create /home if drive is smaller than 7GB
 - do not propose to deselect media if none can be deselected
+- use and install ntfs-3g by default for ntfs partitions (#37823)
 
 Version 10.6.25 - 28 February 2008
 
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index afc6cca74..7cf2de647 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -576,6 +576,7 @@ sub default_packages {
 
     push @l, 'quota' if any { $_->{options} =~ /usrquota|grpquota/ } @{$o->{fstab}};
     push @l, uniq(grep { $_ } map { fs::format::package_needed_for_partition_type($_) } @{$o->{fstab}});
+    push @l, 'ntfs-3g' if any { $_->{fs_type} eq 'ntfs-3g' } @{$o->{fstab}};
 
     my @locale_pkgs = map { URPM::packages_providing($o->{packages}, 'locales-' . $_) } lang::langsLANGUAGE($o->{locale}{langs});
     unshift @l, uniq(map { $_->name } @locale_pkgs);