From ff4d256a950648b12348a42ef11dea8dd19c7453 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Mon, 15 Jun 2020 16:37:15 +0100 Subject: 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. --- perl-install/diskdrake/interactive.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'perl-install/diskdrake/interactive.pm') 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'; -- cgit v1.2.1