summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-16 12:54:59 +0100
committerThomas Backlund <tmb@mageia.org>2015-03-20 21:09:31 +0159
commit515ed30f0c4e82e737bf3a5b6933e603762e6f69 (patch)
tree924688f657e020545027a2918badab903adf5924 /perl-install/diskdrake
parent4367f1f8425cb24361b11d0f75e2e1f32a341452 (diff)
downloaddrakx-515ed30f0c4e82e737bf3a5b6933e603762e6f69.tar
drakx-515ed30f0c4e82e737bf3a5b6933e603762e6f69.tar.gz
drakx-515ed30f0c4e82e737bf3a5b6933e603762e6f69.tar.bz2
drakx-515ed30f0c4e82e737bf3a5b6933e603762e6f69.tar.xz
drakx-515ed30f0c4e82e737bf3a5b6933e603762e6f69.zip
do not suggests /boot/EFI uselessly (mga#15448)
we were creating another one when there was already one...
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/interactive.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 9356a1930..dbf3fb374 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -356,7 +356,7 @@ sub Clear_all {
sub Auto_allocate {
my ($in, $hd, $all_hds) = @_;
- my $suggestions = partitions_suggestions($in) or return;
+ my $suggestions = partitions_suggestions($in, $all_hds) or return;
my %all_hds_ = %$all_hds;
$all_hds_{hds} = [ sort { $a == $hd ? -1 : 1 } fs::get::hds($all_hds) ];
@@ -1203,7 +1203,9 @@ sub ask_alldatawillbelost {
}
sub partitions_suggestions {
- my ($in) = @_;
+ my ($in, $all_hds) = @_;
+ my $fstab = [ fs::get::fstab($all_hds) ];
+ fsedit::init_efi_suggestions($fstab);
my $t = $::expert ?
$in->ask_from_list_(N("Partitioning Type"), N("What type of partitioning?"), [ keys %fsedit::suggestions ]) :
'simple';