From f39f307ded336dddb9a4767b1128b82471446412 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 11 Mar 2000 01:11:06 +0000
Subject: no_comment

---
 perl-install/install_steps_interactive.pm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

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;
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1