summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-08 08:57:06 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-08 08:57:06 +0000
commit4fcf385fb0fbafe600047720d897264ca3c1be93 (patch)
tree1b257c5951a490dbe976be5d0ca591b8393adf9a
parent12362708e41ca2bc290c999e5b378501bd8c4136 (diff)
downloaddrakx-4fcf385fb0fbafe600047720d897264ca3c1be93.tar
drakx-4fcf385fb0fbafe600047720d897264ca3c1be93.tar.gz
drakx-4fcf385fb0fbafe600047720d897264ca3c1be93.tar.bz2
drakx-4fcf385fb0fbafe600047720d897264ca3c1be93.tar.xz
drakx-4fcf385fb0fbafe600047720d897264ca3c1be93.zip
(read_providers_backend) move it from network::tools to network::isdn
-rw-r--r--perl-install/network/isdn.pm3
-rw-r--r--perl-install/network/tools.pm4
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 037968629..87480d74a 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -14,8 +14,9 @@ use MDK::Common::File;
@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_backend isdn_get_list isdn_get_info);
+@EXPORT = qw(isdn_write_config isdn_write_config_backend get_info_providers_backend isdn_ask_info isdn_ask_protocol isdn_ask isdn_detect_backend isdn_get_list isdn_get_info read_providers_backend);
+sub read_providers_backend { my ($file) = @_; map { /(.*?)=>/ } catMaybeCompressed($file) }
sub isdn_write_config {
my ($isdn, $netc) = @_;
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 4a39028d3..d908ceabb 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -8,7 +8,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK);
use MDK::Common::System qw(getVarsFromSh);
@ISA = qw(Exporter);
-@EXPORT = qw(connect_backend connected connected_bg disconnect_backend is_dynamic_ip passwd_by_login read_providers_backend read_secret_backend set_cnx_script test_connected write_cnx_script write_initscript write_secret_backend);
+@EXPORT = qw(connect_backend connected connected_bg disconnect_backend is_dynamic_ip passwd_by_login read_secret_backend set_cnx_script test_connected write_cnx_script write_initscript write_secret_backend);
our $connect_prog = "/etc/sysconfig/network-scripts/net_cnx_pg";
our $connect_file = "/etc/sysconfig/network-scripts/net_cnx_up";
@@ -75,8 +75,6 @@ sub connect_backend() { run_program::rooted($::prefix, "$connect_file &") }
sub disconnect_backend() { run_program::rooted($::prefix, "$disconnect_file &") }
-sub read_providers_backend { my ($file) = @_; map { /(.*?)=>/ } catMaybeCompressed($file) }
-
sub connected() { gethostbyname("mandrakesoft.com") ? 1 : 0 }
# request a ref on a bg_connect and a ref on a scalar