diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-05 15:47:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-05 15:47:41 +0000 |
| commit | 975a721c5c91fdc06e459fb84642241c103b50c8 (patch) | |
| tree | a3dd1f2d710c715e9444ca5de58120065528937d | |
| parent | 9bae65d7a789a0db04209a13d79848688d8580ae (diff) | |
| download | drakx-975a721c5c91fdc06e459fb84642241c103b50c8.tar drakx-975a721c5c91fdc06e459fb84642241c103b50c8.tar.gz drakx-975a721c5c91fdc06e459fb84642241c103b50c8.tar.bz2 drakx-975a721c5c91fdc06e459fb84642241c103b50c8.tar.xz drakx-975a721c5c91fdc06e459fb84642241c103b50c8.zip | |
- fix resizing/formatting ntfs, and create "Windows" entry in bootloader
(broken because of ntfs-3g switch in previous release)
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs/format.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 7c0b68096..be146de81 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- diskdrake: + o fix resizing/formatting ntfs (broken because of ntfs-3g switch in previous + release) + Version 10.9 - 5 March 2008 - adapt to new kernel-2.6.25's sysfs layout (Eric Pielbug, #38235) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 1c0136379..d873d5eaa 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1008,7 +1008,7 @@ sub suggest { log::l("found the following files on potential windows partition $_->{device}: " . join(' ', @root_files)); intersection(\@root_files, [ "windows", "winnt" ]); } - grep { isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs') + grep { isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs', 'ntfs-3g') && fs::type::part2type_name($_) !~ /^Hidden/; } map { @{$_->{primary}{normal}} } @{$all_hds->{hds}}; diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 07a21c610..73bd41222 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -669,7 +669,7 @@ sub Resize { } else { delete $nice_resize{ext2}; } - } elsif ($part->{fs_type} eq 'ntfs') { + } elsif ($part->{fs_type} =~ /ntfs/) { write_partitions($in, $hd) or return; require diskdrake::resize_ntfs; diskdrake::resize_ntfs::check_prog($in) or return; diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index a0fef6e4e..6757cf0ea 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -23,6 +23,7 @@ my %cmds = ( vfat => [ 'dosfstools', 'mkdosfs', '-F', '32' ], swap => [ 'util-linux-ng', 'mkswap' ], ntfs => [ 'ntfsprogs', 'mkntfs', '--fast' ], + 'ntfs-3g' => [ 'ntfsprogs', 'mkntfs', '--fast' ], ); my %LABELs = ( #- option, length, handled_by_mount diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index fdf12a0c3..281808989 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix resizing/formatting ntfs, and create "Windows" entry in bootloader + (broken because of ntfs-3g switch in previous release) - install kernel586 on Transmeta Crusoe TM5800 (#37866) Version 10.8 - 4 March 2008 |