summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-22 07:16:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-22 07:16:19 +0000
commit2b32eb8ec4e95a7ece4a6fec6d0aa1026a210fbe (patch)
treeaf5798effda2b54bd96ced76b167343810291b93
parent246c9e0c1e08bdbd4df99a5352deafb3d7144f8e (diff)
downloaddrakx-2b32eb8ec4e95a7ece4a6fec6d0aa1026a210fbe.tar
drakx-2b32eb8ec4e95a7ece4a6fec6d0aa1026a210fbe.tar.gz
drakx-2b32eb8ec4e95a7ece4a6fec6d0aa1026a210fbe.tar.bz2
drakx-2b32eb8ec4e95a7ece4a6fec6d0aa1026a210fbe.tar.xz
drakx-2b32eb8ec4e95a7ece4a6fec6d0aa1026a210fbe.zip
isRemovableDrive() doesn't check isRemovableUsb() anymore allowing more usb
removable drives (esp. some usb keys declared as memory cards (0x0c76 0x0005))
-rw-r--r--perl-install/detect_devices.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 3e699ba24..3a74a2c2d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -180,7 +180,7 @@ sub isKeyUsb { $_[0]{usb_media_type} && index($_[0]{usb_media_type}, 'Mass Stora
sub isFloppyUsb { $_[0]{usb_driver} && $_[0]{usb_driver} eq 'Removable:floppy' }
sub isRemovableDrive {
my ($e) = @_;
- isZipDrive($e) || isLS120Drive($e) || $e->{media_type} && $e->{media_type} eq 'fd' || isRemovableUsb($e) || $e->{usb_media_type} && index($e->{usb_media_type}, 'Mass Storage|Floppy (UFI)') == 0;
+ isZipDrive($e) || isLS120Drive($e) || $e->{media_type} && $e->{media_type} eq 'fd' || $e->{usb_media_type} && index($e->{usb_media_type}, 'Mass Storage|Floppy (UFI)') == 0;
}
sub getSCSI_24() {