summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-22 02:57:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-22 02:57:46 +0000
commitadd673ee95090e4d8d024e9b32a05f6491b3b343 (patch)
tree3d7c54c7b0036ab24d89561381c6fe7252d8d330
parent5b30e65108ae6fd3c7782702f761069282109114 (diff)
downloaddrakx-add673ee95090e4d8d024e9b32a05f6491b3b343.tar
drakx-add673ee95090e4d8d024e9b32a05f6491b3b343.tar.gz
drakx-add673ee95090e4d8d024e9b32a05f6491b3b343.tar.bz2
drakx-add673ee95090e4d8d024e9b32a05f6491b3b343.tar.xz
drakx-add673ee95090e4d8d024e9b32a05f6491b3b343.zip
more cleanup
-rw-r--r--perl-install/detect_devices.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 77fa5c388..ae6fdc2a7 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -857,9 +857,8 @@ sub suggest_mount_point {
my $name = $e->{media_type};
if (member($e->{media_type}, 'hd', 'fd')) {
if (exists $e->{usb_driver}) {
- return usb2removable($e) || 'removable';
- }
- if (isZipDrive($e)) {
+ $name = usb2removable($e) || 'removable';
+ } elsif (isZipDrive($e)) {
$name = 'zip';
} elsif ($e->{media_type} eq 'fd') {
$name = 'floppy';