summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-15 13:25:42 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-15 13:25:42 +0000
commit91f5904bdde9d2b2116aead085e096efb328b158 (patch)
tree0044bab6e38da0d1cbc998cf5bf535f8f7fae563
parent0c6e573c13a7a6ae15f5d532d46076d10436afe5 (diff)
downloaddrakx-91f5904bdde9d2b2116aead085e096efb328b158.tar
drakx-91f5904bdde9d2b2116aead085e096efb328b158.tar.gz
drakx-91f5904bdde9d2b2116aead085e096efb328b158.tar.bz2
drakx-91f5904bdde9d2b2116aead085e096efb328b158.tar.xz
drakx-91f5904bdde9d2b2116aead085e096efb328b158.zip
move USB and SMBus controllers from unknown section to their own non
configurable section too
-rw-r--r--perl-install/harddrake/data.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 21da3c332..40f7861e7 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -10,7 +10,7 @@ our ($version, $sbindir, $bindir) = ("1.1.5", "/usr/sbin", "/usr/bin");
# Update me each time you handle one more devices class (aka configurator)
sub unknown {
- grep { $_->{media_type} !~ /tape|DISPLAY|MULTIMEDIA_VIDEO|STORAGE_IDE|BRIDGE|NETWORK|MULTIMEDIA_AUDIO/ } detect_devices::probeall(1);
+ grep { $_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO)|STORAGE_IDE|BRIDGE|NETWORK|MULTIMEDIA_AUDIO/ } detect_devices::probeall(1);
}
@@ -49,7 +49,7 @@ our @tree =
# ["","Modem", "Modem.png", "", \&detect_devices::getNet],
# ["","Isdn", "", "", \&detect_devices::getNet]
- ["BRIDGE","Bridge", "memory.png", "", sub {grep { $_->{media_type} =~ 'BRIDGE' } @devices}],
+ ["BRIDGE","Bridge(s)", "memory.png", "", sub {grep { $_->{media_type} =~ 'BRIDGE' } @devices}],
# ["","Cpu", "cpu.png", "", sub {}],
# ["","Memory", "memory.png", "", sub {}],
["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown],
@@ -61,9 +61,10 @@ our @tree =
["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { require mouse; &mouse::detect()}],
["JOYSTICK","Joystick", "joystick.png", "", sub {}],
- ["","Ideinterface", "ide_hd.png", "", sub {grep { $_->{media_type} =~ 'STORAGE_IDE' } @devices}],
+ ["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub {grep { $_->{media_type} =~ 'STORAGE_IDE' } @devices}],
# ["","Scsiinterface", "Scsiinterface.png", "", \&detect_devices::getSCSI],
-# ["","Usbinterface", "Usbinterface.png", "", \&detect_devices::usb_probe]
+ ["USB_CONTROLLER","USB controllers", "usb.png", "", sub {grep { $_->{media_type} =~ 'SERIAL_USB' } @devices}],
+ ["SMB_CONTROLLER","SMBus controllers", "usb.png", "", sub {grep { $_->{media_type} =~ 'SERIAL_SMBUS' } @devices}],
);