diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-31 18:28:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-31 18:28:00 +0000 |
| commit | 4fb58f50234c507d82cea15e3708e1b4d1584503 (patch) | |
| tree | ed48615b9dc74fe1ed6504b701376d93847e1de7 /perl-install/install_interactive.pm | |
| parent | e49ef06e94b9c3846ab6c4bd50afcb5d77597720 (diff) | |
| download | drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.gz drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.bz2 drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.xz drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.zip | |
no_comment
Diffstat (limited to 'perl-install/install_interactive.pm')
| -rw-r--r-- | perl-install/install_interactive.pm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index fd7e85024..074f8aff5 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -52,10 +52,14 @@ sub partitionWizardSolutions { # each solution is a [ score, text, function ], where the function retunrs true if succeeded - if (fsedit::free_space(grep { partition_table::can_raw_add($_) } @$hds) > $min_linux and !$readonly) { + my @good_hds = grep { partition_table::can_raw_add($_) } @$hds; + if (fsedit::free_space(@good_hds) > $min_linux and !$readonly) { $solutions{free_space} = [ 20, _("Use free space"), sub { fsedit::auto_allocate($hds, $o->{partitions}); 1 } ] } else { - push @wizlog, _("Not enough free space to allocate new partitions"); + push @wizlog, _("Not enough free space to allocate new partitions") . ": " . + (@good_hds ? + fsedit::free_space(@good_hds) . " < $min_linux" : + "no harddrive on which partitions can be added") if !$readonly; } if (@$fstab) { @@ -269,10 +273,11 @@ sub setup_thiskind { } @l = map { $_->{description} } @l; while (1) { + my ($msg_type) = $type =~ /(.*)|/; my $msg = @l ? - [ _("Found %s %s interfaces", join(", ", @l), $type), + [ _("Found %s %s interfaces", join(", ", @l), $msg_type), _("Do you have another one?") ] : - _("Do you have any %s interfaces?", $type); + _("Do you have any %s interfaces?", $msg_type); my $opt = [ __("Yes"), __("No") ]; push @$opt, __("See hardware info") if $::expert; |