summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-04 11:14:00 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-04 11:14:00 +0000
commitc9bce49edb95981c46bda5f68983ac21dd246b0c (patch)
treed065322a2211899dc22b9163feece8a2cf80a2f7
parent0181426813c25b0c06463cb7075ef5dc632e4364 (diff)
downloaddrakx-c9bce49edb95981c46bda5f68983ac21dd246b0c.tar
drakx-c9bce49edb95981c46bda5f68983ac21dd246b0c.tar.gz
drakx-c9bce49edb95981c46bda5f68983ac21dd246b0c.tar.bz2
drakx-c9bce49edb95981c46bda5f68983ac21dd246b0c.tar.xz
drakx-c9bce49edb95981c46bda5f68983ac21dd246b0c.zip
use detect_devices::is_lan_interface
-rwxr-xr-xperl-install/standalone/drakconnect5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 0e02f2e4d..34d739da2 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -34,6 +34,7 @@ use network::ethernet;
use network::tools;
use network::modem;
use network::network;
+use detect_devices;
use c;
use modules;
use network::isdn;
@@ -204,7 +205,7 @@ sub manage {
@all_cards = network::ethernet::get_eth_cards($modules_conf);
my %names = network::ethernet::get_eth_cards_names(@all_cards);
foreach (keys %names) {
- my $dev = /eth|ath|wlan/ ? $names{$_} : $_;
+ my $dev = detect_devices::is_lan_interface($_) ? $names{$_} : $_;
$p->{$dev} = {
name => $_ ,
intf => $intf->{$_}
@@ -298,7 +299,7 @@ sub build_notebook {
my ($netc, $intf, $gui, $apply_button, $interface, $interface_name) = @_;
my $apply = sub { $apply_button->set_sensitive(1) };
- my $is_ethernet = $interface =~ /eth|ath|wlan/;
+ my $is_ethernet = detect_devices::is_lan_interface($interface);
if ($intf->{pages}{'TCP/IP'}) {
gtkpack($gui->{sheet}{'TCP/IP'} = Gtk2::HBox->new,