summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-10-14 04:51:13 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-10-14 04:51:13 -0400
commit0f290b259328a6020285a4b4a5c9ca919daa0179 (patch)
tree219e707dcddf5938921459698986c6d6435d1cc5 /perl-install
parent6048b0faf45cb7c76cf03d66ce1105c7419fc5dd (diff)
downloaddrakx-0f290b259328a6020285a4b4a5c9ca919daa0179.tar
drakx-0f290b259328a6020285a4b4a5c9ca919daa0179.tar.gz
drakx-0f290b259328a6020285a4b4a5c9ca919daa0179.tar.bz2
drakx-0f290b259328a6020285a4b4a5c9ca919daa0179.tar.xz
drakx-0f290b259328a6020285a4b4a5c9ca919daa0179.zip
fix detecting some devices as network
commit 5debe867e12c9b062ee15fe59f09e8a7b34627b2 landed in wrong place...
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/data.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 50496da7f..30460dc94 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -385,7 +385,7 @@ our @tree =
string => N("Bluetooth devices"),
icon => "hw_network.png",
configurator => "",
- detector => sub { f(detect_devices::probe_category('bus/bluetooth')), f(grep { $_->{description} =~ /Bluetooth Dongle|WLAN/ } @devices) },
+ detector => sub { f(detect_devices::probe_category('bus/bluetooth')), f(grep { $_->{description} =~ /Bluetooth Dongle/ } @devices) },
checked_on_boot => 1,
},
@@ -400,7 +400,8 @@ our @tree =
f(grep {
$_->{media_type} && $_->{media_type} =~ /^NETWORK/
|| $_->{type} && $_->{type} eq 'network'
- || member($_->{driver}, @net_modules);
+ || member($_->{driver}, @net_modules)
+ || $_->{description} =~ /WLAN/;
} @devices);
},
checked_on_boot => 1,