summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-14 23:43:25 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-14 23:43:25 +0000
commit816611491e0184792a6d481faed41557bfefb707 (patch)
tree1e8972ad55f45ddd2e3e48c5c3ac628ccb5a2db9 /perl-install/install2.pm
parent0b53ba66063c183f5bd5587c89c125024002c62b (diff)
downloaddrakx-backup-do-not-use-816611491e0184792a6d481faed41557bfefb707.tar
drakx-backup-do-not-use-816611491e0184792a6d481faed41557bfefb707.tar.gz
drakx-backup-do-not-use-816611491e0184792a6d481faed41557bfefb707.tar.bz2
drakx-backup-do-not-use-816611491e0184792a6d481faed41557bfefb707.tar.xz
drakx-backup-do-not-use-816611491e0184792a6d481faed41557bfefb707.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm8
1 files changed, 1 insertions, 7 deletions
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()) {