diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-03 14:23:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-03 14:23:31 +0000 |
| commit | 4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb (patch) | |
| tree | 0fbde1c8c2615138dbef59381c79615379342c20 /perl-install/detect_devices.pm | |
| parent | 08f4b5bf2f57dc0d75dcde2cec410a16e1f65f20 (diff) | |
| download | drakx-backup-do-not-use-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar drakx-backup-do-not-use-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar.gz drakx-backup-do-not-use-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar.bz2 drakx-backup-do-not-use-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar.xz drakx-backup-do-not-use-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.zip | |
no_comment
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 74e498d8d..ee4aa3319 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -34,8 +34,9 @@ sub get { [ \&hasCompaqSmartArray, \&getCompaqSmartArray ]; } sub hds() { grep { $_->{type} eq 'hd' && ($::isStandalone || !isRemovableDrive($_)) } get(); } -sub zips() { grep { $_->{type} eq 'hd' && isZipDrive($_) } get(); } -#-sub jazzs() { grep { $_->{type} eq 'hd' && isJazDrive($_) } get(); } +sub zips() { grep { $_->{type} =~ /.d/ && isZipDrive($_) } get(); } +sub ide_zips() { grep { $_->{type} =~ /.d/ && isZipDrive($_) } getIDE(); } +#-sub jazzs() { grep { $_->{type} =~ /.d/ && isJazDrive($_) } get(); } sub ls120s() { grep { $_->{type} =~ /.d/ && isLS120Drive($_) } get(); } sub cdroms() { my @l = grep { $_->{type} eq 'cdrom' } get(); @@ -51,7 +52,7 @@ sub cdroms() { @l; } sub floppies() { - my @ide = map { $_->{device} } grep { $_->{type} eq 'fd' } get() and modules::load("ide-floppy"); + my @ide = map { $_->{device} } ls120s() and modules::load("ide-floppy"); (@ide, grep { tryOpen($_) } qw(fd0 fd1)); } #- example ls120, model = "LS-120 SLIM 02 UHD Floppy" @@ -197,12 +198,11 @@ sub syslog { sub hasSMP { c::detectSMP() } -#- warning: hasUltra66 does a pci probe sub hasUltra66 { cat_("/proc/cmdline") =~ /(ide2=(\S+)(\s+ide3=(\S+))?)/ and return $1; require pci_probing::main; - my @l = map { $_->[0] } grep { $_->[1] =~ /(HPT|Ultra66)/ } pci_probing::main::probe('STORAGE_OTHER', 'more') or return; + my @l = map { $_->[0] } pci_probing::main::matching_desc('(HPT|Ultra66)') or return; my $ide = sprintf "ide2=0x%x,0x%x ide3=0x%x,0x%x", @l == 2 ? |