From 9602001c7823079a8e8ca0e737a8fe2f6c0db0d2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 4 Jul 2002 22:25:15 +0000
Subject: adapt to new modules.pm

---
 perl-install/network/ethernet.pm   | 6 +++---
 perl-install/network/isdn.pm       | 2 +-
 perl-install/network/netconnect.pm | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'perl-install/network')

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);
-- 
cgit v1.2.1