diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-06-16 16:40:48 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-06-16 17:23:48 +0100 |
| commit | b0472581f467472c7e473bf892f6ec1184218182 (patch) | |
| tree | fea96955a2ede10d30bc636ff03687ccea42c667 | |
| parent | 7cac608b3608649021cef3be9139c0aa9d3d0716 (diff) | |
| download | drakx-b0472581f467472c7e473bf892f6ec1184218182.tar drakx-b0472581f467472c7e473bf892f6ec1184218182.tar.gz drakx-b0472581f467472c7e473bf892f6ec1184218182.tar.bz2 drakx-b0472581f467472c7e473bf892f6ec1184218182.tar.xz drakx-b0472581f467472c7e473bf892f6ec1184218182.zip | |
Ignore swap on other devices when suggesting partitions on removable device.
| -rw-r--r-- | perl-install/fsedit.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 684d802d7..fc979ce87 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -402,7 +402,8 @@ sub suggest_part { my $hd = fs::get::part2hd($part, $all_hds); my $hd_size = $hd && $hd->{totalsectors}; # nb: no $hd if $part is /dev/mdX - my $has_swap = any { isSwap($_) } fs::get::fstab($all_hds); + my @fstab = $hd->{is_removable} ? partition_table::get_normal_parts($hd) : fs::get::fstab($all_hds); + my $has_swap = any { isSwap($_) } @fstab; my @local_suggestions = grep { $::auto_install || !$_->{mntpoint} && !$_->{VG_name} || !fs::get::has_mntpoint($_->{mntpoint}, $all_hds) || isSwap($_) && !$has_swap } |