From 816611491e0184792a6d481faed41557bfefb707 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 14 Sep 1999 23:43:25 +0000
Subject: no_comment

---
 perl-install/install2.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d718467fc..098b6a1fd 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -247,7 +247,7 @@ my %suggestedPartitions = (
 #-if you want to do a kickstart file, you just have to add all the required fields (see for example
 #-the variable $default)
 #-#######################################################################################
-$o = { 
+$o = $::o = { 
     bootloader => { onmbr => 1, linear => 0 },
     autoSCSI   => 0,
     mkbootdisk => 1, #- no mkbootdisk if 0 or undef,   find a floppy with 1
@@ -587,12 +587,6 @@ sub main {
     modules::read_already_loaded();
     modparm::read_modparm_file(($::testing ? "/tmp" : "/usr/share") . "/modparm.lst");
 
-    if ($o->{method} && $o->{method} eq "ftp") {
-	require 'ftp.pm';
-	local $^W = 0;
-	*install_any::getFile = \&ftp::getFile;
-    }
-
     #-the main cycle
     my $clicked = 0;
     MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) {
-- 
cgit v1.2.1