From 06918ccb39aed05ce9b1a375b2b0d11d86cf26aa Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 2 Jan 2008 18:35:18 +0000
Subject: harddrake: check that media are not USB keys before auto-configuring
 them (#34568)

---
 perl-install/harddrake/data.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'perl-install/harddrake')

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 0e4c3a069..d4e8d2ee2 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -36,7 +36,8 @@ sub f {
 # FIXME: add translated items
 
 sub is_removable { member($_[0], qw(FLOPPY ZIP DVDROM CDROM BURNER)) }
-sub is_auto_configurable_media { is_removable($_[0]) || member($_[0], qw(HARDDISK)) }
+sub is_auto_configurable_class { is_removable($_[0]) || member($_[0], qw(HARDDISK)) }
+sub is_auto_configurable_media { !detect_devices::isKeyUsb($_[0]) }
 
 sub set_removable_configurator {
     my ($class, $device) = @_;
@@ -44,13 +45,13 @@ sub set_removable_configurator {
  }
 
 sub set_media_auto_configurator {
-    my ($class, $device) = @_;
-    return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_auto_configurable_media($class);
+    my ($device) = @_;
+    return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_auto_configurable_media($device);
 }
 
 sub set_media_remover {
-    my ($class, $device) = @_;
-    return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_media($class);
+    my ($device) = @_;
+    return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_media($device);
 }
 
 my $modules_conf = modules::any_conf->read;
-- 
cgit v1.2.1