summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-25 22:00:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-25 22:00:16 +0000
commite38950a33c3505db7e79547622aa5946cfe88d5c (patch)
treeecb94365673b2f74e264d0cae8467a4481aea21f /perl-install/install_any.pm
parent5692f13be4ba57a7f52b54a7576bd858f418dc14 (diff)
downloaddrakx-e38950a33c3505db7e79547622aa5946cfe88d5c.tar
drakx-e38950a33c3505db7e79547622aa5946cfe88d5c.tar.gz
drakx-e38950a33c3505db7e79547622aa5946cfe88d5c.tar.bz2
drakx-e38950a33c3505db7e79547622aa5946cfe88d5c.tar.xz
drakx-e38950a33c3505db7e79547622aa5946cfe88d5c.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 4fc28d345..e919ec395 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -245,9 +245,9 @@ sub getAvailableSpace {
#- 50mb may be a good choice to avoid almost all problem of insuficient space left...
my $minAvailableSize = 50 * sqr(1024);
- int ((!$::testing &&
- getAvailableSpace_mounted($o->{prefix}) ||
- getAvailableSpace_raw($o->{fstab}) * 512 / 1.07) - $minAvailableSize);
+ my $n = !$::testing && getAvailableSpace_mounted($o->{prefix}) ||
+ getAvailableSpace_raw($o->{fstab}) * 512 / 1.07;
+ $n - max(0.1 * $n, $minAvailableSize);
}
sub getAvailableSpace_mounted {
@@ -301,7 +301,8 @@ sub setPackages($) {
$o->{compss} = pkgs::readCompss($o->{prefix}, $o->{packages});
#- must be done after getProvides
$o->{compssListLevels} = pkgs::readCompssList($o->{packages}, lang::get_langs());
- ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{packages}, $o->{compss});
+ ($o->{compssUsers}, $o->{compssUsersSorted}, $o->{compssUsersIcons}) =
+ pkgs::readCompssUsers($o->{packages}, $o->{compss});
my @l = ();
push @l, "kapm", "kcmlaptop", "DrakProfile", "DrakSync" if $o->{pcmcia};
@@ -618,7 +619,7 @@ sub suggest_mount_points {
$part->{mntpoint} = $mnt; delete $part->{unsafeMntpoint};
#- try to find other mount points via fstab
- fs::get_mntpoints_from_fstab([ fsedit::get_fstab(@$hds) ], $d, $uniq) if $mnt eq '/' && $uniq;
+ fs::get_mntpoints_from_fstab([ fsedit::get_fstab(@$hds) ], $d, $uniq) if $mnt eq '/';
}
#- $_->{mntpoint} || fsedit::suggest_part($_, $hds) foreach @parts;