summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-05 16:55:18 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-05 16:55:18 +0000
commit0ab66801de59b6e39d0418a14bd9afd405cadef4 (patch)
tree6794057c2a9562124f592fbe37d474958a9a3836
parent7222353e0a25f5d4eced256d9aefd9146ed6606e (diff)
downloaddrakx-backup-do-not-use-0ab66801de59b6e39d0418a14bd9afd405cadef4.tar
drakx-backup-do-not-use-0ab66801de59b6e39d0418a14bd9afd405cadef4.tar.gz
drakx-backup-do-not-use-0ab66801de59b6e39d0418a14bd9afd405cadef4.tar.bz2
drakx-backup-do-not-use-0ab66801de59b6e39d0418a14bd9afd405cadef4.tar.xz
drakx-backup-do-not-use-0ab66801de59b6e39d0418a14bd9afd405cadef4.zip
all "gpsca*" driven devices are webcam
-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 164542221..ef4f74a88 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -13,6 +13,8 @@
o give console rights for current session when renaming user
- drakdvb:
o install w_scan if needed (#48242)
+- harddrake:
+ o all "gpsca*" driven devices are webcam
- localdrake/finish-install:
o fix reading default input method setting
- remove extents options on ext4 when updating fstab
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index dd8686752..8a429558d 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -326,7 +326,8 @@ 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' || member($_->{driver}, @modules) } @devices);
+ f(grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO|Video\|Video Control/ && $_->{bus} ne 'PCI'
+ || member($_->{driver}, @modules) || $_->{driver} =~ /^gpsca/ } @devices);
},
# managed by hotplug:
checked_on_boot => 0,