diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-11-21 11:12:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-11-21 11:12:19 +0000 |
| commit | e7824747d4e6dff795518d8f70b82ac08fa332f2 (patch) | |
| tree | c94614d18d370e85742264c4d3d192a234a3d553 | |
| parent | dee901a3fde82083a630082f04c0139c73ba248f (diff) | |
| download | drakx-e7824747d4e6dff795518d8f70b82ac08fa332f2.tar drakx-e7824747d4e6dff795518d8f70b82ac08fa332f2.tar.gz drakx-e7824747d4e6dff795518d8f70b82ac08fa332f2.tar.bz2 drakx-e7824747d4e6dff795518d8f70b82ac08fa332f2.tar.xz drakx-e7824747d4e6dff795518d8f70b82ac08fa332f2.zip | |
(suggestions_mntpoint): if there's no server suggestion, use the simple
one, so that 'simple' is the only one required when someone modifies %fsedit::suggestions
| -rw-r--r-- | perl-install/fsedit.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 1061fb7a0..9a3f0bb32 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -393,7 +393,7 @@ sub computeSize { sub suggest_part { my ($part, $all_hds, $suggestions) = @_; - $suggestions ||= $suggestions{server}; + $suggestions ||= $suggestions{server} || $suggestions{simple}; my $has_swap = grep { isSwap($_) } get_all_fstab($all_hds); @@ -422,7 +422,7 @@ sub suggest_part { sub suggestions_mntpoint { my ($all_hds) = @_; sort grep { !/swap/ && !has_mntpoint($_, $all_hds) } - (@suggestions_mntpoints, map { $_->{mntpoint} } @{$suggestions{server}}); + (@suggestions_mntpoints, map { $_->{mntpoint} } @{$suggestions{server} || $suggestions{simple}}); } #-sub partitionDrives { |