summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-02 13:15:43 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-02 13:15:43 +0000
commit08393f98d1e047a52d57c4e23568148ea9807184 (patch)
treed372dd3431e971de41d248d20e86b07acbdcc5a1 /perl-install
parent081f85d747c9ccd5b5a55668f939afabdd41fa7d (diff)
downloaddrakx-08393f98d1e047a52d57c4e23568148ea9807184.tar
drakx-08393f98d1e047a52d57c4e23568148ea9807184.tar.gz
drakx-08393f98d1e047a52d57c4e23568148ea9807184.tar.bz2
drakx-08393f98d1e047a52d57c4e23568148ea9807184.tar.xz
drakx-08393f98d1e047a52d57c4e23568148ea9807184.zip
remove pseudo global variables use from adsl_conf_backend()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/adsl.pm3
-rw-r--r--perl-install/network/netconnect.pm2
2 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index b1c5fe82a..eba319c6b 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -6,7 +6,6 @@ use network::tools;
use network::ethernet;
use modules;
use vars qw(@ISA @EXPORT);
-use MDK::Common::Globals "network", qw($in);
@ISA = qw(Exporter);
@EXPORT = qw(adsl_conf_backend);
@@ -94,7 +93,7 @@ sub adsl_detect() {
}
sub adsl_conf_backend {
- my ($adsl, $netc, $adsl_device, $adsl_type, $o_netcnx) = @_;
+ my ($in, $adsl, $netc, $adsl_device, $adsl_type, $o_netcnx) = @_;
# FIXME: should not be needed:
defined $o_netcnx and $netc->{adsltype} = $o_netcnx->{type};
$netc->{adsltype} ||= "adsl_$adsl_type";
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index c9e385388..c4de05e26 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -703,7 +703,7 @@ If you don't know, choose 'use pppoe'"),
],
},
post => sub {
- network::adsl::adsl_conf_backend($netcnx, $netc, $ntf_name, $adsl_type); #FIXME
+ network::adsl::adsl_conf_backend($in, $netcnx, $netc, $ntf_name, $adsl_type); #FIXME
$handle_multiple_cnx->();
},
},