summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-11 01:11:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-11 01:11:06 +0000
commitf39f307ded336dddb9a4767b1128b82471446412 (patch)
tree1b32019b5547e9706346c48fb34f8dfa062af865 /perl-install/install_steps_interactive.pm
parent39b16a6249eb865a2319a8e3cb1e4270e6fec539 (diff)
downloaddrakx-f39f307ded336dddb9a4767b1128b82471446412.tar
drakx-f39f307ded336dddb9a4767b1128b82471446412.tar.gz
drakx-f39f307ded336dddb9a4767b1128b82471446412.tar.bz2
drakx-f39f307ded336dddb9a4767b1128b82471446412.tar.xz
drakx-f39f307ded336dddb9a4767b1128b82471446412.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm21
1 files changed, 12 insertions, 9 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 86bed9004..3fa598da9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -25,6 +25,7 @@ use mouse;
use modules;
use lang;
use services;
+use loopback;
use keyboard;
use any;
use fs;
@@ -223,15 +224,17 @@ sub choosePartitionsToFormat($$) {
[ map { \$_->{toFormatCheck} } @l ]) or goto &choosePartitionsToFormat if $::expert;
}
-sub formatPartitions {
- my $o = shift;
- my $w = $o->wait_message('', '');
- foreach (@_) {
- if ($_->{toFormat}) {
- $w->set(_("Formatting partition %s", $_->{device}));
- fs::format_part($o->{raid}, $_);
- }
- }
+
+sub formatMountPartitions {
+ my ($o, $fstab) = @_;
+ my $w = $o->wait_message('', _("Formatting partitions"));
+ fs::formatMount_all($o->{raid}, $o->{fstab}, $o->{prefix}, sub {
+ my ($part) = @_;
+ $w->set(isLoopback($part) ?
+ _("Creating and formatting loopback file %s", loopback::file($part)) :
+ _("Formatting partition %s", $part->{device}));
+ });
+ die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024;
}
#------------------------------------------------------------------------------