summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-12 16:46:36 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-12 16:46:36 +0000
commitec0c1a41addcc5b103e93cf713e134e64a8a0db2 (patch)
treefc7381b12cc8e47bc6e53047ca4793c8b4ccaaa2
parent104e0b2362f580f33d854fafc78b13453dbaae38 (diff)
downloaddrakx-ec0c1a41addcc5b103e93cf713e134e64a8a0db2.tar
drakx-ec0c1a41addcc5b103e93cf713e134e64a8a0db2.tar.gz
drakx-ec0c1a41addcc5b103e93cf713e134e64a8a0db2.tar.bz2
drakx-ec0c1a41addcc5b103e93cf713e134e64a8a0db2.tar.xz
drakx-ec0c1a41addcc5b103e93cf713e134e64a8a0db2.zip
fix driver blacklist
-rw-r--r--perl-install/harddrake/data.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index aa9cd214e..4f48596d5 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -13,7 +13,7 @@ my @devices = detect_devices::probeall();
# Update me each time you handle one more devices class (aka configurator)
sub unknown() {
grep { $_->{media_type} !~ /BRIDGE|class\|Mouse|DISPLAY|Hub|MEMORY_RAM|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|NETWORK|Printer|SERIAL_(USB|SMBUS)|STORAGE_(IDE|OTHER|SCSI)|tape/
- && member($_->{driver}, qw(cpia_usb cyber2000fb forcedeth ibmcam megaraid mod_quickcam nvnet ohci1394 ov511 ov518_decomp scanner ultracam usbvideo usbvision))
+ && !member($_->{driver}, qw(cpia_usb cyber2000fb forcedeth ibmcam megaraid mod_quickcam nvnet ohci1394 ov511 ov518_decomp scanner ultracam usbvideo usbvision))
&& $_->{driver} !~ /^ISDN|Mouse:USB|Removable:zip|class\|Mouse|www.linmodems.org/
&& $_->{type} ne 'network'
&& $_->{description} !~ /Alcatel|ADSL Modem/
@@ -96,6 +96,7 @@ our @tree =
sub custom_id {
my ($device, $str) = @_;
+ return if !ref($device);
defined($device->{device}) ? $device->{device} :
(defined($device->{processor}) ?
N("cpu # ") . $device->{processor} . ": " . $device->{'model name'} :