From 524333b049d44b0369062ddf7566873b92bf9128 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Mar 2008 15:48:10 +0000
Subject: - handle ntfs-3g in fstab

---
 rescue/NEWS                 | 2 ++
 rescue/guessmounts          | 2 +-
 rescue/partimage_whole_disk | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'rescue')

diff --git a/rescue/NEWS b/rescue/NEWS
index 4fb9433d1..d6335a105 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- handle ntfs-3g in fstab
+
 Version 1.8 - 28 February 2008, by Olivier "blino" Blin
 
 - support new modules location (#38207)
diff --git a/rescue/guessmounts b/rescue/guessmounts
index 312c3f303..fbbfa2812 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -77,7 +77,7 @@ if ($root) {
 	  !$_->{fs_type} || $_->{device} eq 'none'
 	    || $valued_options->{noauto}
 	    || $_->{mntpoint} eq '/'
-	    || member($_->{fs_type}, 'swap', 'nfs', 'ntfs');
+	    || member($_->{fs_type}, 'swap', 'nfs', 'ntfs', 'ntfs-3g');
 
 	delete $valued_options->{'iocharset='};
 	delete $valued_options->{'codepage='};
diff --git a/rescue/partimage_whole_disk b/rescue/partimage_whole_disk
index 6d10ffdd7..5e8a6f915 100755
--- a/rescue/partimage_whole_disk
+++ b/rescue/partimage_whole_disk
@@ -66,7 +66,7 @@ sub save_all {
     my $part_list = [ partition_table::get_normal_parts($hd) ];
 
     foreach (@$part_list) {
-	$_->{saved} = !member($_->{fs_type}, 'ntfs', 'vfat', 'swap');
+	$_->{saved} = !member($_->{fs_type}, 'ntfs', 'ntfs-3g', 'vfat', 'swap');
     }
 
     if (!$options{save_home_directory}) {
@@ -103,7 +103,7 @@ sub rest_all {
 	put_in_hash($_, partition_table::hd2minimal_part($hd)) foreach @$part_list;
 
 	my ($from_partimage, $other) = partition { $_->{saved} } @$part_list;
-	my ($from_resize, $created) = partition { member($_->{fs_type}, 'vfat', 'ntfs') } @$other;
+	my ($from_resize, $created) = partition { member($_->{fs_type}, 'vfat', 'ntfs', 'ntfs-3g') } @$other;
 	
 	my $total = sum(map { $_->{size} } @$part_list);
 	if ($total > $hd->{totalsectors}) {
-- 
cgit v1.2.1