merge fix from HEAD: do not automatically configure removable media in

harddrake GUI (only in harddrake service)

2 files changed, 6 insertions, 1 deletions

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 70ce2c5c8..00f6c1d33 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -38,6 +38,11 @@ sub is_removable { $_[0] =~ /FLOPPY|ZIP|DVDROM|CDROM|BURNER/ }
 
 sub set_removable_configurator {
     my ($class, $device) = @_;
+    return "/usr/sbin/diskdrake --removable=$device->{device}" if is_removable($class);
+ }
+
+sub set_removable_auto_configurator {
+    my ($class, $device) = @_;
     return "/usr/sbin/drakupdate_fstab --auto --no-flag --add $device->{device}" if is_removable($class);
 }
 
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 1b95f6cf1..e107edf57 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -83,7 +83,7 @@ foreach my $hw_class (@harddrake::data::tree) {
     my @configurator_pool;
     if (harddrake::data::is_removable($Ident)) {
         foreach my $device (@ID{@added}) {
-            push @configurator_pool, harddrake::data::set_removable_configurator($Ident, $device);
+            push @configurator_pool, harddrake::data::set_removable_auto_configurator($Ident, $device);
         };
         foreach my $device (@$oldconfig{@was_removed}) {
             push @configurator_pool, harddrake::data::set_removable_remover($Ident, $device);