summaryrefslogtreecommitdiffstats
path: root/perl-install/harddrake/data.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-31 09:20:36 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-31 09:20:36 +0000
commit9e6d5347318da13047abc379cfc0ddf65c87b628 (patch)
treec384d07665d915c03a9bc645022de50fcb5885cf /perl-install/harddrake/data.pm
parent3274c8723d495a7974cb360720abc88ba5a78a67 (diff)
downloaddrakx-backup-do-not-use-9e6d5347318da13047abc379cfc0ddf65c87b628.tar
drakx-backup-do-not-use-9e6d5347318da13047abc379cfc0ddf65c87b628.tar.gz
drakx-backup-do-not-use-9e6d5347318da13047abc379cfc0ddf65c87b628.tar.bz2
drakx-backup-do-not-use-9e6d5347318da13047abc379cfc0ddf65c87b628.tar.xz
drakx-backup-do-not-use-9e6d5347318da13047abc379cfc0ddf65c87b628.zip
- bump version number
- fix pcmcia network card detection (no more unknown) - fix scsi detection : o fix SCSI controllers detection (no more unknown) o fix misdetection of scsi devices as scsi host adapter o fix double scsi devices detection (both unknown and real category) - update TODO list
Diffstat (limited to 'perl-install/harddrake/data.pm')
-rw-r--r--perl-install/harddrake/data.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 24df932d9..f0fbcc2a3 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -6,13 +6,13 @@ use MDK::Common;
use class_discard;
our (@ISA, @EXPORT_OK) = (qw(Exporter), (qw(version tree)));
-our ($version, $sbindir, $bindir) = ("1.1.6", "/usr/sbin", "/usr/bin");
+our ($version, $sbindir, $bindir) = ("1.1.7", "/usr/sbin", "/usr/bin");
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|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') } @devices;
+ grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_(IDE|SCSI)|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') && $_->{type} ne 'network'} @devices;
}
@@ -47,7 +47,7 @@ our @tree =
my @usbnet = qw/CDCEther catc kaweth pegasus usbnet/;
# should be taken from detect_devices.pm or modules.pm. it's identical
- grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) } @devices}],
+ grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices}],
# ["","Tokenring cards", "Ethernetcard.png", "", \&detect_devices::getNet],
# ["","FDDI cards", "Ethernetcard.png", "", \&detect_devices::getNet],
# ["","Modem", "Modem.png", "", \&detect_devices::getNet],
@@ -66,7 +66,7 @@ our @tree =
["JOYSTICK","Joystick", "joystick.png", "", sub {}],
["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub {grep { $_->{media_type} =~ 'STORAGE_IDE' } @devices}],
- ["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", \&detect_devices::getSCSI],
+ ["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", sub {grep { $_->{media_type} =~ 'STORAGE_SCSI' } @devices}],
["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}],
);