summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-05 15:48:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-05 15:48:10 +0000
commit524333b049d44b0369062ddf7566873b92bf9128 (patch)
treea2c2098e3e29576f677f1b7579fb924fcadd95b6
parent975a721c5c91fdc06e459fb84642241c103b50c8 (diff)
downloaddrakx-524333b049d44b0369062ddf7566873b92bf9128.tar
drakx-524333b049d44b0369062ddf7566873b92bf9128.tar.gz
drakx-524333b049d44b0369062ddf7566873b92bf9128.tar.bz2
drakx-524333b049d44b0369062ddf7566873b92bf9128.tar.xz
drakx-524333b049d44b0369062ddf7566873b92bf9128.zip
- handle ntfs-3g in fstab
-rw-r--r--rescue/NEWS2
-rwxr-xr-xrescue/guessmounts2
-rwxr-xr-xrescue/partimage_whole_disk4
3 files changed, 5 insertions, 3 deletions
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}) {