summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-17 19:29:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-17 19:29:49 +0000
commitb6d4a46002270eaa64708ff8bdc7121ce6fd6fdb (patch)
tree3d6984d5841ecc8cc6453342b37ad45a7fca8d93 /perl-install
parent72324a1ab79d50807a8d372e68bbe815816464c6 (diff)
downloaddrakx-b6d4a46002270eaa64708ff8bdc7121ce6fd6fdb.tar
drakx-b6d4a46002270eaa64708ff8bdc7121ce6fd6fdb.tar.gz
drakx-b6d4a46002270eaa64708ff8bdc7121ce6fd6fdb.tar.bz2
drakx-b6d4a46002270eaa64708ff8bdc7121ce6fd6fdb.tar.xz
drakx-b6d4a46002270eaa64708ff8bdc7121ce6fd6fdb.zip
better error message when auto allocate doesn't do anything
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fsedit.pm12
1 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 449893e8b..91de6a0ff 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -533,12 +533,20 @@ sub auto_allocate {
my ($all_hds, $suggestions) = @_;
my $before = listlength(fsedit::get_all_fstab($all_hds));
- allocatePartitions($all_hds, $suggestions || $suggestions{simple});
+ my $suggestions_ = $suggestions || $suggestions{simple};
+ allocatePartitions($all_hds, $suggestions_);
auto_allocate_raids($all_hds, $suggestions) if $suggestions;
partition_table::assign_device_numbers($_) foreach @{$all_hds->{hds}};
- $before != listlength(fsedit::get_all_fstab($all_hds));
+ if ($before == listlength(fsedit::get_all_fstab($all_hds))) {
+ # find out why auto_allocate failed
+ if (my @l = grep { !has_mntpoint($_->{mntpoint}, $all_hds) } @$suggestions_) {
+ die _("Not enough free space for auto-allocating");
+ } else {
+ die _("Nothing to do");
+ }
+ }
}
sub auto_allocate_raids {