diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-12-23 18:18:06 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-12-23 18:18:06 +0000 |
| commit | f6c0e2788954d8240a7be4a5b7295b87ff4ba225 (patch) | |
| tree | 2d4435b0468e76457df5712a7cfc1da87906f622 | |
| parent | 298dc436f41f09a83e5372755714d91b2fcfee8c (diff) | |
| download | drakx-f6c0e2788954d8240a7be4a5b7295b87ff4ba225.tar drakx-f6c0e2788954d8240a7be4a5b7295b87ff4ba225.tar.gz drakx-f6c0e2788954d8240a7be4a5b7295b87ff4ba225.tar.bz2 drakx-f6c0e2788954d8240a7be4a5b7295b87ff4ba225.tar.xz drakx-f6c0e2788954d8240a7be4a5b7295b87ff4ba225.zip | |
fix detecting some cameras
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/harddrake/data.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 6fde70404..118377064 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,8 @@ - installation mount points: reset unknown partitions types to default fs (ext4) instead of hardcoded ext3 - diskdrake: show Ext4 instead of Ext3 in the gtk filesystems button box +- harddrake: + o fix detecting some cameras Version 13.2 - 14 December 2009 diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 66c747179..f80ed5da1 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -315,7 +315,7 @@ our @tree = detector => sub { require list_modules; my @modules = (list_modules::category2modules('multimedia/webcam'), 'Removable:camera'); - f(grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO|Video\|Video Control/ && $_->{bus} ne 'PCI' + f(grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO|Video\|Video Control|Imaging/ && $_->{bus} ne 'PCI' || member($_->{driver}, @modules) || $_->{driver} =~ /^gpsca/ } @devices); }, # managed by hotplug: |