summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-12-09 17:24:11 +0000
committerThierry Vignaud <tv@mandriva.org>2008-12-09 17:24:11 +0000
commita8eb5be8b4e391834a8d65cd4060e5be7f57215f (patch)
treee17bfae65ef9dcf4b2448cda005513c1f6ca3cb1
parentf3c88fd13a336f1d9cdf98859ec222108bc486da (diff)
downloaddrakx-a8eb5be8b4e391834a8d65cd4060e5be7f57215f.tar
drakx-a8eb5be8b4e391834a8d65cd4060e5be7f57215f.tar.gz
drakx-a8eb5be8b4e391834a8d65cd4060e5be7f57215f.tar.bz2
drakx-a8eb5be8b4e391834a8d65cd4060e5be7f57215f.tar.xz
drakx-a8eb5be8b4e391834a8d65cd4060e5be7f57215f.zip
do not show duplicated hardware as unknown (#46242): * list PC Speaker as sound card
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/data.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 22ee20d38..8f38551f8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -10,6 +10,8 @@
- harddrake:
o do not list PATA controllers as SATA
(else we could just list all ATA controllers together)
+ o do not show duplicated hardware as unknown (#46242):
+ * list PC Speaker as sound card
Version 11.71 - 6 November 2008
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 13c0f303f..f51350a32 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -303,7 +303,8 @@ our @tree =
detector => sub {
require list_modules;
my @modules = list_modules::category2modules('multimedia/sound');
- f(grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ || member($_->{driver}, @modules) } @devices);
+ f(grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ || member($_->{driver}, @modules)
+ || $_->{description} =~ /PC Speaker/ } @devices);
},
checked_on_boot => 1,
},