summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-10 17:27:33 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-12 22:55:01 +0200
commit012092f339a35e884a511a9a46837210aec208ff (patch)
treed630c7b08864dd0f5065bd3ffe4f7a2609c4a12c
parent12ed7fa3856e828100e8ced0a52800fb37124fff (diff)
downloaddrakx-012092f339a35e884a511a9a46837210aec208ff.tar
drakx-012092f339a35e884a511a9a46837210aec208ff.tar.gz
drakx-012092f339a35e884a511a9a46837210aec208ff.tar.bz2
drakx-012092f339a35e884a511a9a46837210aec208ff.tar.xz
drakx-012092f339a35e884a511a9a46837210aec208ff.zip
don't guess a drive letter for ESP partitions
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/partition_table.pm4
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ff077fda1..aa7282360 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
- dont force 'p' for dmraid partitions, it's conditional depending
on device naming like dmraid, kpartx and kernel handles it
+- diskdrake:
+ o don't guess a drive letter for ESP partitions
Version 16.80 - 9 April 2015
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9ef7511d2..ed2a2e5dd 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,8 @@
- add kpartx for dmraid activation
- fix upgrade when package's in several media (mga#15350)
(need URPM-5.06 too)
+- partionning:
+ o don't guess a drive letter for ESP partitions
Version 16.80 - 9 April 2015
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index d376de621..39c029899 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -133,11 +133,11 @@ sub assign_device_numbers {
#- first verify there's at least one primary dos partition, otherwise it
#- means it is a secondary disk and all will be false :(
#-
- my ($c, @others) = grep { isFat_or_NTFS($_) } @{$hd->{primary}{normal}};
+ my ($c, @others) = grep { isnormal_Fat_or_NTFS($_) } @{$hd->{primary}{normal}};
$i = ord 'C';
$c->{device_windobe} = chr($i++) if $c;
- $_->{device_windobe} = chr($i++) foreach grep { isFat_or_NTFS($_) && !isRecovery($_) } map { $_->{normal} } @{$hd->{extended}};
+ $_->{device_windobe} = chr($i++) foreach grep { isnormal_Fat_or_NTFS($_) } map { $_->{normal} } @{$hd->{extended}};
$_->{device_windobe} = chr($i++) foreach @others;
}