summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake/interactive.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-06-15 16:37:15 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-06-16 17:20:06 +0100
commitff4d256a950648b12348a42ef11dea8dd19c7453 (patch)
treec414788c4ab55022d5213ea2307852e4b82b04e5 /perl-install/diskdrake/interactive.pm
parent8fca7cfca3baa1639e316c8307dd20479cbe8d1d (diff)
downloaddrakx-ff4d256a950648b12348a42ef11dea8dd19c7453.tar
drakx-ff4d256a950648b12348a42ef11dea8dd19c7453.tar.gz
drakx-ff4d256a950648b12348a42ef11dea8dd19c7453.tar.bz2
drakx-ff4d256a950648b12348a42ef11dea8dd19c7453.tar.xz
drakx-ff4d256a950648b12348a42ef11dea8dd19c7453.zip
When installing on a removable device, suggest an ESP on that device.
We must update the suggestions each time the user selects a different target device.
Diffstat (limited to 'perl-install/diskdrake/interactive.pm')
-rw-r--r--perl-install/diskdrake/interactive.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index fea28e7c3..45b830cc1 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -353,12 +353,12 @@ sub Clear_all {
$hd->{getting_rid_of_readonly_allowed} = 0; #- we don't need this flag anymore
fsedit::partition_table_clear_and_initialize($all_hds->{lvms}, $hd, $in);
}
- fsedit::init_mntpnt_suggestions($all_hds, 1);
+ fsedit::init_mntpnt_suggestions($all_hds, $hd, 1);
}
sub Auto_allocate {
my ($in, $hd, $all_hds) = @_;
- my $suggestions = partitions_suggestions($in, $all_hds) or return;
+ my $suggestions = partitions_suggestions($in, $all_hds, $hd) or return;
my %all_hds_ = %$all_hds;
$all_hds_{hds} = [ sort { $a == $hd ? -1 : 1 } fs::get::hds($all_hds) ];
@@ -1244,8 +1244,8 @@ sub ask_alldatawillbelost {
}
sub partitions_suggestions {
- my ($in, $all_hds) = @_;
- fsedit::init_mntpnt_suggestions($all_hds);
+ my ($in, $all_hds, $hd) = @_;
+ fsedit::init_mntpnt_suggestions($all_hds, $hd);
my $t = $::expert ?
$in->ask_from_list_(N("Partitioning Type"), N("What type of partitioning?"), [ keys %fsedit::suggestions ]) :
'simple';