summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/harddrake/data.pm10
1 files changed, 1 insertions, 9 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index c1bfd8669..f34d3a7a9 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -12,7 +12,7 @@ my @devices = detect_devices::probeall(1);
# Update me each time you handle one more devices class (aka configurator)
sub unknown {
- grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB|/} @devices;
+ grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI|OTHER)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network' && $_->{driver} !~ /Mouse:USB/} @devices;
}
@@ -28,7 +28,6 @@ our @tree =
["BURNER","CD/DVD burners", "cd.png", "", \&detect_devices::burners, 0 ],
["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms}, 0 ],
["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ],
-# ["CDBURNER","Cd burners", "cd.png", "", \&detect_devices::burners, 1 ],
["VIDEO","Videocard", "video.png", "$sbindir/XFdrake",
sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ 'DISPLAY_VGA' } @devices }, 1 ],
@@ -38,7 +37,6 @@ our @tree =
sub { grep { $_->{media_type} =~ 'MULTIMEDIA_OTHER' } @devices}, 0 ],
["AUDIO","Soundcard", "sound.png", "$sbindir/draksound",
sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices}, 0 ],
-# "MULTIMEDIA_AUDIO" => "/usr/bin/X11/sounddrake";
["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI'} @devices }, 0 ],
["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub {
#- generic NIC detection for USB seems broken (class, subclass,
@@ -48,18 +46,12 @@ our @tree =
# should be taken from detect_devices.pm or modules.pm. it's identical
grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices}, 1 ],
-# ["","Tokenring cards", "Ethernetcard.png", "", \&detect_devices::getNet, 1 ],
-# ["","FDDI cards", "Ethernetcard.png", "", \&detect_devices::getNet, 1 ],
["MODEM","Modem", "modem.png", "", sub { require network::modem;
my $modem;
network::modem::modem_detect_backend($modem);
grep { $modem->{device} } @{ $modem };
} , 0 ],
-# ["","Isdn", "", "", \&detect_devices::getNet]
-
["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices}, 0 ],
-# ["","Cpu", "cpu.png", "", sub {}, 0 ],
-# ["","Memory", "memory.png", "", sub {}, 0 ],
["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown, 0 ],
["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake",