summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-23 23:30:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-23 23:30:54 +0000
commit041bce7f1ab685a4290865e4eb2c2f5d2aaac285 (patch)
treed7305d5a8fb789cffc0c4795cc3ff7eff2b8585f /perl-install/install_steps.pm
parent61b38e21c24cb2537b7105f5867745d0a569ec6f (diff)
downloaddrakx-backup-do-not-use-041bce7f1ab685a4290865e4eb2c2f5d2aaac285.tar
drakx-backup-do-not-use-041bce7f1ab685a4290865e4eb2c2f5d2aaac285.tar.gz
drakx-backup-do-not-use-041bce7f1ab685a4290865e4eb2c2f5d2aaac285.tar.bz2
drakx-backup-do-not-use-041bce7f1ab685a4290865e4eb2c2f5d2aaac285.tar.xz
drakx-backup-do-not-use-041bce7f1ab685a4290865e4eb2c2f5d2aaac285.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm9
1 files changed, 7 insertions, 2 deletions
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);