uses the fantastic global module.

6 files changed, 11 insertions, 4 deletions

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 2583cbd29..40e698a9b 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -6,6 +6,7 @@ use network::tools;
 use network::ethernet;
 
 use vars qw(@ISA @EXPORT);
+use globals qw($in $prefix $install);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(adsl_ask_info adsl_detect adsl_conf adsl_conf_backend);
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 5417520b8..24d916c65 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -6,6 +6,7 @@ use any;
 use detect_devices;
 use common qw(:file);
 use vars qw(@ISA @EXPORT);
+use globals qw($in $prefix $install);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(conf_network_card conf_network_card_backend go_ethernet);
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 718aa11fe..30ae495e5 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -6,6 +6,7 @@ use modules;
 use log;
 use network::tools;
 use vars qw(@ISA @EXPORT);
+use globals qw($in $prefix $install);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(isdn_write_config isdn_write_config_backend get_info_providers_backend isdn_ask_info isdn_ask_protocol isdn_ask isdn_detect isdn_detect_backend isdn_get_list isdn_get_info);
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 347351254..024c0f70b 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -7,6 +7,7 @@ use detect_devices;
 use mouse;
 use network::tools;
 use vars qw(@ISA @EXPORT);
+use globals qw($in $prefix $install);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(pppConfig modem_detect_backend);
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index ae1d2abcf..001fb4698 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -18,16 +18,16 @@ use commands;
 #require Data::Dumper;
 
 use network::tools;
+use globals qw($in $prefix $install);
 
 $connect_file = "/etc/sysconfig/network-scripts/net_cnx_up";
 $disconnect_file = "/etc/sysconfig/network-scripts/net_cnx_down";
 $connect_prog = "/etc/sysconfig/network-scripts/net_cnx_pg";
 
-sub init { ($prefix, $in, $install) = @_ }
-
 #- intro is called only in standalone.
 sub intro {
-    ($prefix, my $netcnx, $in, $install) = @_;
+    (my $prefix, my $netcnx, my $in, my $install) = @_;
+    globals::init(in => $in, prefix => $prefix, install => $install);
     my ($netc, $mouse, $intf) = ({}, {}, {});
     my $text;
     my $connected;
@@ -85,7 +85,8 @@ sub detect {
 }
 
 sub main {
-    ($prefix, my $netcnx, my $netc, my $mouse, $in, my $intf, $install, my $first_time, my $direct_fr) = @_;
+    (my $prefix, my $netcnx, my $netc, my $mouse, my $in, my $intf, my $install, my $first_time, my $direct_fr) = @_;
+    globals::init(in => $in, prefix => $prefix, install => $install);
     $netc->{minus_one}=0; #When one configure an eth in dhcp without gateway
     $::isInstall and $in->set_help('configureNetwork');
     $::isStandalone and read_net_conf($netcnx, $netc); # REDONDANCE with intro. FIXME
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 8234c8143..f9967c7b3 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -3,9 +3,11 @@ package network::tools;
 use common qw(:common :file);
 use run_program;
 use vars qw(@ISA @EXPORT);
+use globals qw($in $prefix $install);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(write_secret_backend ask_connect_now connect_backend disconnect_backend read_providers_backend ask_info2 connected disconnected);
+@EXPORT_OK = qw($in);
 
 sub write_secret_backend {
     my ($a, $b) = @_;