diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-07-05 23:12:51 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-07-05 23:16:24 +0200 |
| commit | 6d124136b1fbb2551d651c115de0cff85aca349d (patch) | |
| tree | b05d0b63dbdf583e2b7a745998209ef6dd2ce87e | |
| parent | bb6a6b14d66b6d261d73c10840b8ec2ae1589d1a (diff) | |
| download | drakx-6d124136b1fbb2551d651c115de0cff85aca349d.tar drakx-6d124136b1fbb2551d651c115de0cff85aca349d.tar.gz drakx-6d124136b1fbb2551d651c115de0cff85aca349d.tar.bz2 drakx-6d124136b1fbb2551d651c115de0cff85aca349d.tar.xz drakx-6d124136b1fbb2551d651c115de0cff85aca349d.zip | |
enable to set several swap partitions (mga#9874)
| -rw-r--r-- | perl-install/fsedit.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index e4e268ef0..36bda4a14 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -403,7 +403,7 @@ sub suggest_part { my $has_swap = any { isSwap($_) } fs::get::fstab($all_hds); my @local_suggestions = - grep { !$_->{mntpoint} && !$_->{VG_name} || !fs::get::has_mntpoint($_->{mntpoint}, $all_hds) || isSwap($_) && !$has_swap } + grep { $::auto_install || !$_->{mntpoint} && !$_->{VG_name} || !fs::get::has_mntpoint($_->{mntpoint}, $all_hds) || isSwap($_) && !$has_swap } grep { !$_->{min_hd_size} || !$hd_size || $_->{min_hd_size} <= $hd_size } grep { !$_->{hd} || $_->{hd} eq $part->{rootDevice} } @$suggestions; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 0b7f08632..3198a48da 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - autoinst: + e enable to set several swap partitions (mga#9874) o enable to select media (mga#12299) - partionning: o GPT: prevent geometry issue on last partition (mga#18666, mga#17796) |