summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-04-12 19:01:19 +0000
committerOlivier Blin <oblin@mandriva.org>2005-04-12 19:01:19 +0000
commit1505cb9a13be9acb25847858726792821dbb2f81 (patch)
treee14b80dcbca800562af6ac23524c09f8ecc3c5ff /perl-install/network
parent4117d95d37b1be87c4f0b78555fca4e7d5e4b542 (diff)
downloaddrakx-1505cb9a13be9acb25847858726792821dbb2f81.tar
drakx-1505cb9a13be9acb25847858726792821dbb2f81.tar.gz
drakx-1505cb9a13be9acb25847858726792821dbb2f81.tar.bz2
drakx-1505cb9a13be9acb25847858726792821dbb2f81.tar.xz
drakx-1505cb9a13be9acb25847858726792821dbb2f81.zip
use sysfs as fallback to detect wireless interfaces (rt2x00/prism2_*)
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/netconnect.pm2
-rw-r--r--perl-install/network/tools.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 24c848ba1..f12e9e23c 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -133,7 +133,7 @@ sub real_main {
%all_eth_intf = network::ethernet::get_eth_cards_names(@all_cards); #- needed not to loose GATEWAYDEV
require list_modules; #- FIXME: check if useful
%eth_intf = map { $_->[0] => join(': ', $_->[0], $_->[2]) }
- grep { to_bool($is_wireless) == c::isNetDeviceWirelessAware($_->[0]) } @all_cards;
+ grep { to_bool($is_wireless) == detect_devices::is_wireless_interface($_->[0]) } @all_cards;
};
my $find_lan_module = sub {
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index d99e0f39e..26e09dd6e 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -282,7 +282,7 @@ sub get_interface_type {
member($interface->{TYPE}, "xDSL", "ADSL") && "adsl" ||
$interface->{DEVICE} =~ /^ippp/ && "isdn" ||
$interface->{DEVICE} =~ /^ppp/ && "modem" ||
- c::isNetDeviceWirelessAware($interface->{DEVICE}) && "wifi" ||
+ detect_devices::is_wireless_interface($interface->{DEVICE}) && "wifi" ||
detect_devices::is_lan_interface($interface->{DEVICE}) && "ethernet" ||
"unknown";
}