summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-29 22:36:51 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-29 22:36:51 +0000
commitaf130a1374fbf25b0a779c6b61dcfa29c10d1fad (patch)
tree497090398708894d3ba14ea78effe5d1f5571fdc /perl-install/network
parent064736938021dcf23e373ed7161a34004927c907 (diff)
downloaddrakx-backup-do-not-use-af130a1374fbf25b0a779c6b61dcfa29c10d1fad.tar
drakx-backup-do-not-use-af130a1374fbf25b0a779c6b61dcfa29c10d1fad.tar.gz
drakx-backup-do-not-use-af130a1374fbf25b0a779c6b61dcfa29c10d1fad.tar.bz2
drakx-backup-do-not-use-af130a1374fbf25b0a779c6b61dcfa29c10d1fad.tar.xz
drakx-backup-do-not-use-af130a1374fbf25b0a779c6b61dcfa29c10d1fad.zip
replace conf_network_card_backend() "detect" calls by get_eth_cards() ones
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/netconnect.pm4
-rw-r--r--perl-install/network/network.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 3e6ea445f..3f0cdc7b8 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -24,7 +24,7 @@ sub detect {
lan => sub { # ethernet
modules::load_category('network/main|gigabit|usb');
require network::ethernet;
- $auto_detect->{lan} = { map { $_->[0] => $_->[1] } network::ethernet::conf_network_card_backend() };
+ $auto_detect->{lan} = { map { $_->[0] => $_->[1] } network::ethernet::get_eth_cards() };
},
adsl => sub {
require network::adsl;
@@ -941,7 +941,7 @@ See iwpriv(8) man page for further information."),
pre => sub {
#-type =static or dhcp
modules::interactive::load_category($in, 'network/main|gigabit|usb', !$::expert, 1);
- @all_cards = conf_network_card_backend($netc, $intf, $type, undef, $ipadr, $netadr) or
+ @all_cards = network::ethernet::get_eth_cards() or
# FIXME: fix this
$in->ask_warn(N("Error"), N("No ethernet network adapter has been detected on your system.
I cannot set up this connection type.")), return;
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 51460d54b..cccd4767d 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -368,7 +368,7 @@ sub easy_dhcp {
require modules;
require network::ethernet;
modules::load_category('network/main|gigabit|usb');
- my @all_cards = network::ethernet::conf_network_card_backend();
+ my @all_cards = network::ethernet::get_eth_cards();
#- only for a single network card
(any { $_->[0] eq 'eth0' } @all_cards) && (every { $_->[0] ne 'eth1' } @all_cards) or return;