summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-04 22:25:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-04 22:25:15 +0000
commit9602001c7823079a8e8ca0e737a8fe2f6c0db0d2 (patch)
tree6a4a4b5bb040972c82f8f23a7f154b7631d95591 /perl-install/network
parentb5b714420602230508f199cb392d21c4410a4f1d (diff)
downloaddrakx-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar
drakx-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar.gz
drakx-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar.bz2
drakx-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.tar.xz
drakx-9602001c7823079a8e8ca0e737a8fe2f6c0db0d2.zip
adapt to new modules.pm
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/ethernet.pm6
-rw-r--r--perl-install/network/isdn.pm2
-rw-r--r--perl-install/network/netconnect.pm6
3 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 7c2afc405..e25cb7e68 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -82,7 +82,7 @@ qq(
sub conf_network_card {
my ($netc, $intf, $type, $ipadr, $netadr) = @_;
#-type =static or dhcp
- any::setup_thiskind($in, 'net', !$::expert, 1);
+ any::load_category($in, 'network/main|usb', !$::expert, 1);
my @all_cards=conf_network_card_backend($netc, $intf, $type, undef, $ipadr, $netadr);
my $interface;
@all_cards == () and $in->ask_warn('', _("No ethernet network adapter has been detected on your system.
@@ -105,7 +105,7 @@ I cannot set up this connection type.")) and return;
1;
}
-#- conf_network_card_backend : configure the network cards and return the list of them, or configure one specified interface : WARNING, you have to setup the ethernet cards, by calling setup_thiskind($in, 'net', !$::expert, 1) or setup_thiskind_backend before calling this function. Basically, you call this function in 2 times.
+#- conf_network_card_backend : configure the network cards and return the list of them, or configure one specified interface : WARNING, you have to setup the ethernet cards, by calling load_category($in, 'network/main|usb', !$::expert, 1) or load_category_backend before calling this function. Basically, you call this function in 2 times.
#- input
#- $prefix
#- $netc
@@ -174,7 +174,7 @@ sub go_ethernet {
sub configureNetwork {
my ($netc, $intf, $first_time) = @_;
local $_;
- any::setup_thiskind($in, 'net', !$::expert, 1);
+ any::load_category($in, 'network/main|usb', !$::expert, 1);
my @l = detect_devices::getNet() or die _("no network card found");
my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef);
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index a6ac063d1..4b081274e 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -249,7 +249,7 @@ sub isdn_detect {
sub isdn_detect_backend {
my ($isdn) = @_;
- if (my ($c) = (modules::get_that_type('isdn'))) {
+ if (my ($c) = (modules::probe_category('network/isdn'))) {
$isdn->{$_} = $c->{$_} foreach qw(description vendor id driver options firmware);
$isdn->{$_} = sprintf("%0x", $isdn->{$_}) foreach ('vendor', 'id');
$isdn->{card_type} = 'pci';
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 835a09e6f..4998124a1 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -69,7 +69,7 @@ sub detect {
$auto_detect->{isdn}{$_}=$isdn->{$_} foreach qw(description vendor id driver card_type type);
$auto_detect->{isdn}{description} =~ s/.*\|//;
- any::setup_thiskind_backend('net', undef);
+ modules::load_category('network/main|usb');
require network::ethernet;
network::ethernet->import;
my @all_cards = conf_network_card_backend (undef, undef, undef, undef, undef, undef);
@@ -334,7 +334,7 @@ fi
#- if ($netc->{NET_DEVICE} and $netc->{NETWORKING} ne 'no' and $::isStandalone and $::expert) {
#- exists $netc->{nb_cards} or do {
-#- any::setup_thiskind($in, 'net', !$::expert, 1);
+#- any::load_category($in, 'network/main|usb', !$::expert, 1);
#- $netc->{nb_cards} = listlength(detect_devices::getNet());
#- };
#- ($netc->{nb_cards} - $netc->{minus_one} - (get_net_device($prefix) =~ /eth.+/ ? 1 : 0) > 0) and $in->ask_okcancel(_("Network Configuration"),
@@ -355,7 +355,7 @@ sub save_conf {
$netcnx->{type} =~ /adsl/ and $adsl=$netcnx->{$netcnx->{type}};
$netcnx->{type} eq 'isdn_external' || $netcnx->{type} eq 'modem' and $modem=$netcnx->{$netcnx->{type}};
$netcnx->{type} eq 'isdn_internal' and $isdn=$netcnx->{$netcnx->{type}};
- any::setup_thiskind_backend('net', undef);
+ modules::load_category('network/main|usb');
require network::ethernet;
network::ethernet->import;
my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef);