From 041bce7f1ab685a4290865e4eb2c2f5d2aaac285 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 23 Sep 2000 23:30:54 +0000
Subject: no_comment

---
 perl-install/install_steps.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 3845469b8..ab087233a 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -131,7 +131,12 @@ sub doPartitionDisksBefore {
 	install_any::getFile("XXX"); #- close still opened filehandle
 	eval { fs::umount("/tmp/hdimage") };
     }
-    eval { fs::umount_all($o->{fstab}, $o->{prefix}) } if $o->{fstab} && !$::testing && !$::live;
+    eval { 
+	close pkgs::LOG;
+	eval { fs::umount("$o->{prefix}/proc") };
+	eval {          fs::umount_all($o->{fstab}, $o->{prefix}) };
+	eval { sleep 1; fs::umount_all($o->{fstab}, $o->{prefix}) } if $@; #- HACK
+    } if $o->{fstab} && !$::testing && !$::live;
 
     $o->{raid} ||= {};
 }
@@ -249,7 +254,7 @@ sub choosePackages {
     #- not be able to start (xfs at least).
     my $available = install_any::getAvailableSpace($o);
     my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
-    log::l("available size $available (corrected $availableCorrected)");
+    log::l(sprintf "available size %dMB (corrected %dMB)", $available / sqr(1024), $availableCorrected / sqr(1024));
 
     foreach (values %{$packages->[0]}) {
 	pkgs::packageSetFlagSkip($_, 0);
-- 
cgit v1.2.1