diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-06-02 08:39:28 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-06-02 08:39:28 +0000 |
commit | 98a649e12397c16d9a3999e8fd88be2e86a6bddf (patch) | |
tree | 5470401728b79f25273b39fef5fd902cff39bd67 | |
parent | ca518976a35c196d12952034c6b6ec0397598bad (diff) | |
download | drakx-98a649e12397c16d9a3999e8fd88be2e86a6bddf.tar drakx-98a649e12397c16d9a3999e8fd88be2e86a6bddf.tar.gz drakx-98a649e12397c16d9a3999e8fd88be2e86a6bddf.tar.bz2 drakx-98a649e12397c16d9a3999e8fd88be2e86a6bddf.tar.xz drakx-98a649e12397c16d9a3999e8fd88be2e86a6bddf.zip |
- partitioning wizard:
o do not propose to resize "hidden" fat partitions
o do not say "the Windows partition" when there can be more than one
-rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 5 | ||||
-rw-r--r-- | perl-install/install/NEWS | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 1ccca8ff5..56e620b47 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -121,9 +121,10 @@ sub partitionWizardSolutions { } - if (my @ok_for_resize_fat = grep { isFat_or_NTFS($_) && !fs::get::part2hd($_, $all_hds)->{readonly} } @$fstab) { + if (my @ok_for_resize_fat = grep { isFat_or_NTFS($_) && !fs::get::part2hd($_, $all_hds)->{readonly} + && fs::type::part2type_name($_) !~ /^Hidden/ } @$fstab) { $solutions{resize_fat} = - [ 20 - @ok_for_resize_fat, N("Use the free space on the Microsoft Windows® partition"), + [ 20 - @ok_for_resize_fat, N("Use the free space on a Microsoft Windows® partition"), sub { my $part = $in->ask_from_listf_raw({ messages => N("Which partition do you want to resize?"), interactive_help_id => 'resizeFATChoose', diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 81cdeae32..638de938a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- partitioning wizard: + o do not propose to resize "hidden" fat partitions + o do not say "the Windows partition" when there can be more than one - use UUID for resume= kernel parameter - handle new drivers: o pata: pata_sch |