From dd5242a9babd987cb8aa965ab48904c5008fbb2d Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Sat, 22 Sep 2007 09:05:06 +0000 Subject: service_harddrake: auto-configure CD-Rom drives in fstab again (even if it prevents KDE media manager from unmounting them), to be consistent with install which actually configures CD-Rom drives in fstab (revert harddrake commit 228859) --- perl-install/harddrake/data.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'perl-install/harddrake/data.pm') diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 398602761..46ac723c0 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -36,7 +36,7 @@ sub f { # FIXME: add translated items sub is_removable { $_[0] =~ /FLOPPY|ZIP|DVDROM|CDROM|BURNER/ } -sub is_auto_configurable_media { $_[0] =~ /FLOPPY|ZIP|HARDDISK/ } +sub is_auto_configurable_media { is_removable($_[0]) || $_[0] =~ /HARDDISK/ } sub set_removable_configurator { my ($class, $device) = @_; @@ -100,7 +100,7 @@ our @tree = icon => "cd.png", configurator => "", detector => sub { f(grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms) }, - checked_on_boot => 0, + checked_on_boot => 1, automatic => 1, }, @@ -110,7 +110,7 @@ our @tree = icon => "cd.png", configurator => "", detector => sub { f(detect_devices::burners()) }, - checked_on_boot => 0, + checked_on_boot => 1, automatic => 1, }, @@ -120,7 +120,7 @@ our @tree = icon => "cd.png", configurator => "", detector => sub { f(grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms()) }, - checked_on_boot => 0, + checked_on_boot => 1, automatic => 1, }, -- cgit v1.2.1