diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-06-02 17:26:47 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-06-02 17:26:47 +0000 |
| commit | 19bd0dc66c75fb4159be11fe4b515882623f888f (patch) | |
| tree | 09c2f885eea7678d123732db862098f460af016a | |
| parent | 8f86fd791d519cff559e406a0cfb12368c240c60 (diff) | |
| download | drakx-19bd0dc66c75fb4159be11fe4b515882623f888f.tar drakx-19bd0dc66c75fb4159be11fe4b515882623f888f.tar.gz drakx-19bd0dc66c75fb4159be11fe4b515882623f888f.tar.bz2 drakx-19bd0dc66c75fb4159be11fe4b515882623f888f.tar.xz drakx-19bd0dc66c75fb4159be11fe4b515882623f888f.zip | |
partitioning wizard: do not propose to resize hidden fat partitions (backport from trunk)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b5048d6de..29fa3a1c1 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -6,6 +6,7 @@ o fix kbluetooth config path o fix autoconfiguration of harddisks - use UUID for resume= kernel parameter +- partitioning wizard: do not propose to resize "hidden" fat partitions Version 10.29.5 - 20 May 2008 diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 1ccca8ff5..e4587bd92 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -121,7 +121,8 @@ 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"), sub { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 818a38768..8ad9bf8a9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - /sbin/usb_id is needed by mouse.pm to generate /dev/input/by-id/xxx (#39868) (and not /LIB/udev/usb_id since drakx-kbd-mouse-x11 0.42) +- partitioning wizard: do not propose to resize "hidden" fat partitions Version 10.29 - 3 April 2008 |