From 79655753befda870a059c6f2585276bad33139f2 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 21 Sep 2007 12:22:08 +0000
Subject: rename media auto configuration functions (and restore old
 is_removable)

---
 perl-install/harddrake/data.pm            | 11 ++++++-----
 perl-install/standalone/service_harddrake |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 231f5991d..398602761 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -35,21 +35,22 @@ sub f {
 
 # FIXME: add translated items
 
-sub is_removable { $_[0] =~ /FLOPPY|ZIP|HARDDISK/ }
+sub is_removable { $_[0] =~ /FLOPPY|ZIP|DVDROM|CDROM|BURNER/ }
+sub is_auto_configurable_media { $_[0] =~ /FLOPPY|ZIP|HARDDISK/ }
 
 sub set_removable_configurator {
     my ($class, $device) = @_;
     return "/usr/sbin/diskdrake --removable=$device->{device}" if is_removable($class);
  }
 
-sub set_removable_auto_configurator {
+sub set_media_auto_configurator {
     my ($class, $device) = @_;
-    return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_removable($class);
+    return "/usr/sbin/drakupdate_fstab --no-flag --auto --add $device->{device}" if is_auto_configurable_media($class);
 }
 
-sub set_removable_remover {
+sub set_media_remover {
     my ($class, $device) = @_;
-    return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_removable($class);
+    return "/usr/sbin/drakupdate_fstab --no-flag --del $device->{device}" if is_auto_configurable_media($class);
 }
 
 my $modules_conf = modules::any_conf->read;
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index f1ef00d8c..1df867999 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -140,12 +140,12 @@ foreach my $hw_class (@harddrake::data::tree) {
     next if $Ident eq 'MOUSE' && $curr_kernel ne $previous_kernel_config{KERNEL} && $cfg{"DETECT_$Ident"} ne 'force';
 
     my @configurator_pool;
-    if (harddrake::data::is_removable($Ident)) {
+    if (harddrake::data::is_auto_configurable_media($Ident)) {
         foreach my $device (@ID{@added}) {
-            push @configurator_pool, harddrake::data::set_removable_auto_configurator($Ident, $device);
+            push @configurator_pool, harddrake::data::set_media_auto_configurator($Ident, $device);
         }
         foreach my $device (@$oldconfig{@was_removed}) {
-            push @configurator_pool, harddrake::data::set_removable_remover($Ident, $device);
+            push @configurator_pool, harddrake::data::set_media_remover($Ident, $device);
         }
     } else {
         @configurator_pool = $configurator;
-- 
cgit v1.2.1