summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-05 22:43:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-05 22:43:46 +0000
commit26a387d5919bba9ccdb8a8447daa114204a997c4 (patch)
treec76ed77468ddcf8ff471514aa3b0eb2b0ee300c4 /perl-install/install_steps.pm
parent0bb6afa215fff585416bc88aa967c7e1eb61672e (diff)
downloaddrakx-backup-do-not-use-26a387d5919bba9ccdb8a8447daa114204a997c4.tar
drakx-backup-do-not-use-26a387d5919bba9ccdb8a8447daa114204a997c4.tar.gz
drakx-backup-do-not-use-26a387d5919bba9ccdb8a8447daa114204a997c4.tar.bz2
drakx-backup-do-not-use-26a387d5919bba9ccdb8a8447daa114204a997c4.tar.xz
drakx-backup-do-not-use-26a387d5919bba9ccdb8a8447daa114204a997c4.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm17
1 files changed, 9 insertions, 8 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 3cd7b5149..b1c842e16 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -406,6 +406,7 @@ sub pppConfig {
#------------------------------------------------------------------------------
sub installCrypto {
my ($o) = @_;
+ return; #TODO broken for now
my $u = $o->{crypto} or return; $u->{mirror} or return;
my ($packages, %done);
my $dir = "$o->{prefix}/tmp";
@@ -421,13 +422,13 @@ sub installCrypto {
require pkgs;
while (crypto::get($u->{mirror}, $dir,
grep { !$done{$_} && ($done{$_} = $u->{packages}{$_}) } %{$u->{packages}})) {
- $packages = pkgs::psUsingDirectory($dir);
- foreach (values %$packages) {
- foreach (c::headerGetEntry(pkgs::getHeader($_), 'requires')) {
- my $r = quotemeta crypto::require2package($_);
- /^$r-\d/ and $u->{packages}{$_} = 1 foreach keys %{$u->{packages}};
- }
- }
+# $packages = pkgs::psUsingDirectory($dir);
+# foreach (values %$packages) {
+# foreach (c::headerGetEntry(pkgs::getHeader($_), 'requires')) {
+# my $r = quotemeta crypto::require2package($_);
+# /^$r-\d/ and $u->{packages}{$_} = 1 foreach keys %{$u->{packages}};
+# }
+# }
}
pkgs::install($o->{prefix}, $o->{isUpgrade}, [ values %$packages ]);
}
@@ -642,7 +643,7 @@ sub setupBootloader($) {
} elsif (arch() =~ /^sparc/) {
silo::install($o->{prefix}, $o->{bootloader});
} else {
- lilo::install($o->{prefix}, $o->{bootloader});
+ lilo::install_grub($o->{prefix}, $o->{bootloader}, $o->{fstab});
}
}