summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2015-04-16 21:50:26 +0000
committerPascal Terjan <pterjan@gmail.com>2015-04-16 21:50:26 +0000
commit7e854d297a8d033bacae45e61fe53a5afd0c7eaf (patch)
tree919fc5444145a82cbf04cd8538dee07a670955db
parentbfab62cf98603eeb1d03b925e105f920e3fd298b (diff)
downloaddrakx-7e854d297a8d033bacae45e61fe53a5afd0c7eaf.tar
drakx-7e854d297a8d033bacae45e61fe53a5afd0c7eaf.tar.gz
drakx-7e854d297a8d033bacae45e61fe53a5afd0c7eaf.tar.bz2
drakx-7e854d297a8d033bacae45e61fe53a5afd0c7eaf.tar.xz
drakx-7e854d297a8d033bacae45e61fe53a5afd0c7eaf.zip
use the windows partition with the most available space
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/fs/partitioning_wizard.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index da8573586..44cf43030 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- partitioning_wizard:
+ o use the windows partition with the most available space, not the one
+ where Windows will have most space left after resizing.
+
Version 16.85 - 15 April 2015
- reuse ESP with "use free space" in live (mga#15690)
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index bbe3ccf8e..3cfa80148 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -178,7 +178,7 @@ sub partitionWizardSolutions {
}, \&partition_table::description, \@ok_for_resize_fat) or return;
$part->{size} > $part->{min_linux} + $part->{min_win} or die N("Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the %s installation.", N("Mageia"));
} else {
- $part = top(grep { $_->{req_size} } @ok_for_resize_fat);
+ $part = top(grep { $_->{size} - $_->{req_size} } @ok_for_resize_fat);
}
my $resize_fat = $part->{resize_fat};
my $hd = fs::get::part2hd($part, $all_hds);