From afcc3f3c046bfba57ac53d3367bbbad035c5136b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 16 Aug 2005 06:26:35 +0000
Subject: fix typo

---
 perl-install/install2.pm    | 2 +-
 perl-install/install_any.pm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 75819eb1d..0e5bbd1e5 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -192,7 +192,7 @@ sub formatPartitions {
     eval { fs::mount::usbfs($::prefix) };
 
     install_any::screenshot_dir__and_move();
-    install_any::move_clp_to_disk($o->{fstab});
+    install_any::move_clp_to_disk($o);
 
     any::rotate_logs($o->{prefix});
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 203d87058..ffabd64c3 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1889,7 +1889,7 @@ sub write_fstab {
 }
 
 sub move_clp_to_disk {
-    my ($fstab) = @_;
+    my ($o) = @_;
 
     our $clp_on_disk;
     return if $clp_on_disk || $::local_install;
@@ -1902,13 +1902,13 @@ sub move_clp_to_disk {
     if (availableRamMB() > 400) {
 	$clp_dir = '/tmp'; #- on tmpfs
     } else {
-	my $tmp = fs::get::mntpoint2part('/tmp', $fstab);
+	my $tmp = fs::get::mntpoint2part('/tmp', $o->{fstab});
 	if ($tmp && fs::df($tmp, $::prefix) / 2 > $clp_size * 1.2) { #- we want at least 20% free afterwards
 	    $clp_dir = "$::prefix/tmp";
 	} else {
-	    my $root = fs::get::mntpoint2part('/', $fstab);
+	    my $root = fs::get::mntpoint2part('/', $o->{fstab});
 	    my $root_free_MB = fs::df($root, $::prefix) / 2 / 1024;
-	    my $wanted_size_MB = $o->{isUpgrade} || fs::get::mntpoint2part('/usr', $fstab) ? 150 : 300;
+	    my $wanted_size_MB = $o->{isUpgrade} || fs::get::mntpoint2part('/usr', $o->{fstab}) ? 150 : 300;
 	    log::l("clp: root free $root_free_MB MB, wanted at least $wanted_size_MB MB");
 	    if ($root_free_MB > $wanted_size_MB) {
 		$clp_dir = $tmp ? $::prefix : "$::prefix/tmp";
-- 
cgit v1.2.1