summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-20 22:10:00 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-20 22:10:00 +0000
commitdb97cfe30d0824effd1462934d43df58ffa7d9bb (patch)
tree4afbfacf7607fe5313a639fdf3d7dfa81f869a75 /perl-install/install_any.pm
parent56c1b0d4fe9f5a9908827a51b22fa53dd0265bbd (diff)
downloaddrakx-db97cfe30d0824effd1462934d43df58ffa7d9bb.tar
drakx-db97cfe30d0824effd1462934d43df58ffa7d9bb.tar.gz
drakx-db97cfe30d0824effd1462934d43df58ffa7d9bb.tar.bz2
drakx-db97cfe30d0824effd1462934d43df58ffa7d9bb.tar.xz
drakx-db97cfe30d0824effd1462934d43df58ffa7d9bb.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d8e5a48f8..d06f02d5c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK);
@ISA = qw(Exporter);
%EXPORT_TAGS = (
- all => [ qw(versionString getNextStep spawnSync spawnShell addToBeDone) ],
+ all => [ qw(getNextStep spawnSync spawnShell addToBeDone) ],
);
@EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
@@ -46,8 +46,8 @@ sub getFile($) {
goto &getFile;
}
-sub versionString {
- local $_ = readlink("$::o->{prefix}/boot/vmlinuz") or die "I couldn't find the kernel package!";
+sub kernelVersion {
+ local $_ = readlink("$::o->{prefix}/boot/vmlinuz") or $::testing && "2.2.testversion" or die "I couldn't find the kernel package!";
first(/vmlinuz-(.*)/);
}
@@ -96,8 +96,8 @@ sub shells($) {
sub getAvailableSpace {
my ($o) = @_;
- do { $_->{mntpoint} eq '/usr' and return $_->{size} << 9 } foreach @{$o->{fstab}};
- do { $_->{mntpoint} eq '/' and return $_->{size} << 9 } foreach @{$o->{fstab}};
+ do { $_->{mntpoint} eq '/usr' and return $_->{size} * 512 } foreach @{$o->{fstab}};
+ do { $_->{mntpoint} eq '/' and return $_->{size} * 512 } foreach @{$o->{fstab}};
if ($::testing) {
log::l("taking 200MB for testing");