summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-13 07:24:29 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-13 17:46:15 +0200
commitbc2512a57d9bd7582561bced8999faffc2987d8c (patch)
tree9b7e7516319f57d9908f7737f1cf895be1e2a371
parent146c308e0801adb9bb97a5ce83ceeb9d7cffe0f0 (diff)
downloaddrakx-bc2512a57d9bd7582561bced8999faffc2987d8c.tar
drakx-bc2512a57d9bd7582561bced8999faffc2987d8c.tar.gz
drakx-bc2512a57d9bd7582561bced8999faffc2987d8c.tar.bz2
drakx-bc2512a57d9bd7582561bced8999faffc2987d8c.tar.xz
drakx-bc2512a57d9bd7582561bced8999faffc2987d8c.zip
ignore ESP for "use free space on MS"
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/partitioning_wizard.pm4
-rw-r--r--perl-install/install/NEWS1
3 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fc97acf75..fe82f4fcb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- diskdrake:
o detect Lenovo recovery & 'SYSTEM_DRV' as such (mga#1371)
o do add a ESP if it was removed by "Clear All"
+ o ignore ESP for "use free space on MS"
Version 16.81 - 12 April 2015
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 1d33c8bfb..bbe3ccf8e 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -112,8 +112,8 @@ sub partitionWizardSolutions {
push @wizlog, N("There is no existing partition to use");
}
- if (my @ok_for_resize_fat = grep { isFat_or_NTFS($_) && !fs::get::part2hd($_, $all_hds)->{readonly}
- && !isRecovery($_) && $_->{size} > $min_linux + $min_swap + $min_freewin } @$fstab) {
+ if (my @ok_for_resize_fat = grep { isnormal_Fat_or_NTFS ($_) && !fs::get::part2hd($_, $all_hds)->{readonly}
+ && $_->{size} > $min_linux + $min_swap + $min_freewin } @$fstab) {
@ok_for_resize_fat = map {
my $part = $_;
my $hd = fs::get::part2hd($part, $all_hds);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a75732e8f..e1150a939 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- partionning:
o detect Lenovo recovery & 'SYSTEM_DRV' as such (mga#1371)
o do add a ESP if it was removed by "Clear All"
+ o ignore ESP for "use free space on MS"
Version 16.81 - 12 April 2015