From dd40621fa1311c9bce97902e2db57f8b15fab449 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 18 Jul 1999 21:05:17 +0000
Subject: *** empty log message ***

---
 perl-install/install_steps.pm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ace94a692..ceef9a294 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -40,7 +40,6 @@ sub leavingStep($$) {
 }
 
 sub chooseLanguage($) {
-#    eval { run_program::run('loadkeys', "/tmp/$o->{default}->{lang}) }; $@ and log::l("loadkeys failed");
     $o->{default}->{lang};
 }
 sub selectInstallOrUpgrade($) {
@@ -78,8 +77,6 @@ sub choosePackages($$$) {
 
 sub beforeInstallPackages($) {
 
-    $o->{method}->prepareMedia($o->{prefix}, $o->{fstab}) unless $::testing;
-
     foreach (qw(dev etc home mnt tmp var var/tmp var/lib var/lib/rpm)) {
 	mkdir "$o->{prefix}/$_", 0755;
     }
@@ -96,7 +93,7 @@ sub beforeInstallPackages($) {
 sub installPackages($$) {
     my ($o, $packages) = @_;
     my $toInstall = [ grep { $_->{selected} } values %$packages ];
-    pkgs::install($o->{prefix}, $o->{method}, $toInstall, $o->{isUpgrade}, 0);
+    pkgs::install($o->{prefix}, $toInstall, $o->{isUpgrade}, 0);
 }
 
 sub afterInstallPackages($) {
@@ -205,7 +202,7 @@ sub setupXfree {
     $o->{packages}->{$x} or die "can't find X server $x";
 
     log::l("I will install the $x package");
-    pkgs::install($o->{prefix}, $o->{method}, $o->{packages}->{$x}, $o->{isUpgrade}, 0);
+    pkgs::install($o->{prefix}, $o->{packages}->{$x}, $o->{isUpgrade}, 0);
 
     #TODO
 }
-- 
cgit v1.2.1