summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/interactive.pm6
-rw-r--r--perl-install/fs/partitioning_wizard.pm2
-rw-r--r--perl-install/fsedit.pm5
3 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index f772c0f8b..7fee8e554 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -352,8 +352,7 @@ 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);
}
- my $fstab = [ fs::get::fstab($all_hds) ];
- fsedit::init_efi_suggestions($fstab, 1);
+ fsedit::init_mntpnt_suggestions($all_hds, 1);
}
sub Auto_allocate {
@@ -1210,8 +1209,7 @@ sub ask_alldatawillbelost {
sub partitions_suggestions {
my ($in, $all_hds) = @_;
- my $fstab = [ fs::get::fstab($all_hds) ];
- fsedit::init_efi_suggestions($fstab);
+ fsedit::init_mntpnt_suggestions($all_hds);
my $t = $::expert ?
$in->ask_from_list_(N("Partitioning Type"), N("What type of partitioning?"), [ keys %fsedit::suggestions ]) :
'simple';
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 6290e8ccb..d04a5bba3 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -100,7 +100,7 @@ sub partitionWizardSolutions {
my $min_linux = MB(600);
my $min_swap = MB(50);
my $min_freewin = MB(100);
- fsedit::init_efi_suggestions($full_fstab);
+ fsedit::init_mntpnt_suggestions($all_hds);
# each solution is a [ score, text, function ], where the function retunrs true if succeeded
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 2e4904bc0..182dd05d8 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -41,8 +41,9 @@ use fs;
],
);
-sub init_efi_suggestions {
- my ($fstab, $o_force) = @_;
+sub init_mntpnt_suggestions {
+ my ($all_hds, $o_force) = @_;
+ my $fstab = [ fs::get::fstab($all_hds) ];
state $done;
return if $done && !$o_force;
$done++;