summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-04-28 10:39:38 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-04-28 10:39:38 +0000
commit017c2ba81cca946de22b5622c7fc93482da4fc39 (patch)
tree7d20aa100530e16c36d5d35563a197670131b6c9
parentf19903c8b5cce235a33f3efecc80cb1b302f4d1d (diff)
downloaddrakx-backup-do-not-use-017c2ba81cca946de22b5622c7fc93482da4fc39.tar
drakx-backup-do-not-use-017c2ba81cca946de22b5622c7fc93482da4fc39.tar.gz
drakx-backup-do-not-use-017c2ba81cca946de22b5622c7fc93482da4fc39.tar.bz2
drakx-backup-do-not-use-017c2ba81cca946de22b5622c7fc93482da4fc39.tar.xz
drakx-backup-do-not-use-017c2ba81cca946de22b5622c7fc93482da4fc39.zip
drop isdn_ fonction names
-rw-r--r--perl-install/network/isdn.pm13
-rw-r--r--perl-install/network/netconnect.pm12
-rwxr-xr-xperl-install/standalone/drakconnect4
3 files changed, 14 insertions, 15 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 9e73b5c4f..b460eb764 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -14,17 +14,16 @@ use MDK::Common::File;
@ISA = qw(Exporter);
-@EXPORT = qw(get_info_providers_backend isdn_detect_backend isdn_get_cards isdn_read_config isdn_write_config isdn_write_config_backend read_providers_backend);
-sub isdn_write_config {
+sub write_config {
my ($isdn, $netc) = @_;
$in->do_pkgs->install('isdn4net', if_($isdn->{speed} =~ /128/, 'ibod'), 'isdn4k-utils');
- isdn_write_config_backend($isdn, $netc);
+ write_config_backend($isdn, $netc);
1;
}
-sub isdn_write_config_backend {
+sub write_config_backend {
my ($isdn, $netc, $o_netcnx) = @_;
defined $o_netcnx and $netc->{isdntype} = $o_netcnx->{type};
@@ -77,7 +76,7 @@ modprobe $isdn->{driver}", if_($isdn->{type}, " type=$isdn->{type}"),
1;
}
-sub isdn_read_config {
+sub read_config {
my ($isdn) = @_;
my %match = (I4L_USERNAME => 'login',
@@ -124,7 +123,7 @@ sub get_info_providers_backend {
sub read_providers_backend() { map { /(.*?)=>/ } catMaybeCompressed($file) }
-sub isdn_detect_backend() {
+sub detect_backend() {
my @isdn;
require detect_devices;
each_index {
@@ -144,7 +143,7 @@ sub isdn_detect_backend() {
\@isdn;
}
-sub isdn_get_cards_by_type {
+sub get_cards_by_type {
my ($isdn_type) = @_;
grep { $_->{card} eq $isdn_type } @isdndata;
}
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 8235bf34c..76f7fbcc1 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -17,7 +17,7 @@ sub detect {
my %l = (
isdn => sub {
require network::isdn;
- $auto_detect->{isdn} = network::isdn::isdn_detect_backend();
+ $auto_detect->{isdn} = network::isdn::detect_backend();
},
lan => sub { # ethernet
modules::load_category('network/main|gigabit|usb');
@@ -304,7 +304,7 @@ sub real_main {
],
},
post => sub {
- network::isdn::isdn_write_config($isdn, $netc); # or return 'isdn_protocol';
+ network::isdn::write_config($isdn, $netc); # or return 'isdn_protocol';
$netc->{$_} = 'ippp0' foreach 'NET_DEVICE', 'NET_INTERFACE';
# return "static_hostname";
$handle_multiple_cnx->();
@@ -347,7 +347,7 @@ sub real_main {
detect($netc->{autodetect}, 'modem');
$netc->{isdntype} = 'isdn_external';
$netcnx->{isdn_external}{device} = network::modem::first_modem($netc);
- network::isdn::isdn_read_config($netcnx->{isdn_external});
+ network::isdn::read_config($netcnx->{isdn_external});
$netcnx->{isdn_external}{special_command} = 'AT&F&O2B40';
require network::modem;
$modem = $netcnx->{isdn_external};
@@ -363,7 +363,7 @@ sub real_main {
$isdn->{description} =~ s/\|/ -- /;
}
- network::isdn::isdn_read_config($netcnx->{isdn_internal});
+ network::isdn::read_config($netcnx->{isdn_internal});
return "isdn_protocol";
},
},
@@ -372,7 +372,7 @@ sub real_main {
isdn_ask =>
{
pre => sub {
- %isdn_cards = network::isdn::isdn_get_cards();
+ %isdn_cards = network::isdn::get_cards();
},
name => N("Select a device !"),
data => sub { [ { label => N("Net Device"), val => \$isdn_name, type => 'list', separator => '|', list => [ keys %isdn_cards ], allow_empty_list => 1 } ] },
@@ -406,7 +406,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
$e = $in->ask_from_listf(N("ISDN Configuration"),
N("Which of the following is your ISDN card?"),
sub { $_[0]{description} },
- [ network::isdn::isdn_get_cards_by_type($isdn->{card_type}) ]) or goto($isdn->{card_type} =~ /usb|pci/ ? 'isdn_ask_step_1' : 'isdn_ask_step_1b');
+ [ network::isdn::get_cards_by_type($isdn->{card_type}) ]) or goto($isdn->{card_type} =~ /usb|pci/ ? 'isdn_ask_step_1' : 'isdn_ask_step_1b');
$e->{$_} and $isdn->{$_} = $e->{$_} foreach qw(driver type mem io io0 io1 irq firmware);
},
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 27c53bb12..c18d5cef5 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -293,8 +293,8 @@ sub build_tree {
}
elsif ($interface eq 'isdn') {
$intf->{pages} = { 'TCP/IP' => 1, 'Account' => 1, 'Modem' => 1, 'Options' => 1 };
- network::isdn::isdn_read_config($intf);
- $intf->{save} = sub { network::isdn::isdn_write_config($intf, $netc) };
+ network::isdn::read_config($intf);
+ $intf->{save} = sub { network::isdn::write_config($intf, $netc) };
}
else {
#- ethernet is default