summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-22 09:05:06 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-22 09:05:06 +0000
commitdd5242a9babd987cb8aa965ab48904c5008fbb2d (patch)
tree35904d0d280be34e6f97bae6b6aa8cc25e1a3f1a
parent2d1169020ed529b999b381cf32cdf3f3c5b7c573 (diff)
downloaddrakx-backup-do-not-use-dd5242a9babd987cb8aa965ab48904c5008fbb2d.tar
drakx-backup-do-not-use-dd5242a9babd987cb8aa965ab48904c5008fbb2d.tar.gz
drakx-backup-do-not-use-dd5242a9babd987cb8aa965ab48904c5008fbb2d.tar.bz2
drakx-backup-do-not-use-dd5242a9babd987cb8aa965ab48904c5008fbb2d.tar.xz
drakx-backup-do-not-use-dd5242a9babd987cb8aa965ab48904c5008fbb2d.zip
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)
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/harddrake/data.pm8
2 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f48dc080c..7ae84e790 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,8 @@
- make formatXiB() handle negative numbers (for rpmdrake)
+- service_harddrake:
+ o 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
Version 10.4.208 - 21 September 2007, by Olivier "blino" Blin
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,
},