diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-03 14:53:37 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-03 14:53:37 +0000 |
| commit | 7ce5892b7a79e9653739c564e81034f535aa56c6 (patch) | |
| tree | 10ee30388650f5352f163b93fcd59bf20e78a8d7 /perl-install/network/network.pm | |
| parent | 4a9eda8b12787d6d414ea4ea0d756ea7ddfc3292 (diff) | |
| download | drakx-7ce5892b7a79e9653739c564e81034f535aa56c6.tar drakx-7ce5892b7a79e9653739c564e81034f535aa56c6.tar.gz drakx-7ce5892b7a79e9653739c564e81034f535aa56c6.tar.bz2 drakx-7ce5892b7a79e9653739c564e81034f535aa56c6.tar.xz drakx-7ce5892b7a79e9653739c564e81034f535aa56c6.zip | |
factorize wireless card detection into network::tools:is_wireless_intf()
Diffstat (limited to 'perl-install/network/network.pm')
| -rw-r--r-- | perl-install/network/network.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index c1f433ec7..12c0a0ba7 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -10,6 +10,7 @@ use Socket; use common; use detect_devices; use run_program; +use network::tools; use any; use vars qw(@ISA @EXPORT); use log; @@ -313,12 +314,8 @@ sub gateway { sub configureNetworkIntf { my ($netc, $in, $intf, $net_device, $skip, $module) = @_; my $text; - my @wireless_modules = qw(aironet_cs aironet4500_cs hermes airo orinoco_cs orinoco airo_cs netwave_cs ray_cs wavelan_cs wvlan_cs airport); - my $flag = 0; - foreach (@wireless_modules) { - $module =~ /$_/ and $flag = 1; - } - if ($flag) { + my @wireless_modules = qw(aironet_cs aironet4500_cs hermes airo orinoco_cs orinoco airo_cs netwave_cs ray_cs wavelan_cs wvlan_cs airport 3c59x); + if (is_wireless_intf($intf, $module)) { $intf->{wireless_eth} = 1; $netc->{wireless_eth} = 1; $intf->{WIRELESS_MODE} = "Managed"; |