diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:52:43 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:52:43 +0000 |
| commit | fccdf94dbd892803774394e53f123c44b2cd1803 (patch) | |
| tree | 025aa222b3b0d248fe5f7cd9f9c30a3529d2833b | |
| parent | 002bf362f20c1e0dab31f72fb510a4199d28ac53 (diff) | |
| download | drakx-fccdf94dbd892803774394e53f123c44b2cd1803.tar drakx-fccdf94dbd892803774394e53f123c44b2cd1803.tar.gz drakx-fccdf94dbd892803774394e53f123c44b2cd1803.tar.bz2 drakx-fccdf94dbd892803774394e53f123c44b2cd1803.tar.xz drakx-fccdf94dbd892803774394e53f123c44b2cd1803.zip | |
do not show duplicated hardware as unknown (#46242): list PC Speaker
as sound card [backported from trunk]
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/harddrake/data.pm | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 94333183f..907ff0f07 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -5,6 +5,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.2 - 5 December 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, }, |