summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-21 11:16:06 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-21 11:16:06 +0000
commit02f06bfe6f0badfb3727abc32ea82e16241e8437 (patch)
tree90e6f52ad1c488758268711b8a779f0d279ecb73
parent02662aec096250e8fa9bc81c5acc32a74be0fe0d (diff)
downloaddrakx-backup-do-not-use-02f06bfe6f0badfb3727abc32ea82e16241e8437.tar
drakx-backup-do-not-use-02f06bfe6f0badfb3727abc32ea82e16241e8437.tar.gz
drakx-backup-do-not-use-02f06bfe6f0badfb3727abc32ea82e16241e8437.tar.bz2
drakx-backup-do-not-use-02f06bfe6f0badfb3727abc32ea82e16241e8437.tar.xz
drakx-backup-do-not-use-02f06bfe6f0badfb3727abc32ea82e16241e8437.zip
harddrake: do not auto-configure CD-Rom drives in fstab, it fordbids umounting with hal (install does not configure them in fstab either)
-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 74111e65f..dab128a1e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- harddrake:
+ o do not auto-configure CD-Rom drives in fstab, it fordbids
+ umounting with hal (install does not configure them in fstab either)
+
Version 10.4.207 - 21 September 2007, by Thierry Vignaud
- drakboot:
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 8d5c50637..feffcab2a 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -35,7 +35,7 @@ sub f {
# FIXME: add translated items
-sub is_removable { $_[0] =~ /FLOPPY|ZIP|DVDROM|CDROM|BURNER/ }
+sub is_removable { $_[0] =~ /FLOPPY|ZIP/ }
sub set_removable_configurator {
my ($class, $device) = @_;
@@ -98,7 +98,7 @@ our @tree =
icon => "cd.png",
configurator => "",
detector => sub { f(grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms) },
- checked_on_boot => 1,
+ checked_on_boot => 0,
automatic => 1,
},
@@ -108,7 +108,7 @@ our @tree =
icon => "cd.png",
configurator => "",
detector => sub { f(detect_devices::burners()) },
- checked_on_boot => 1,
+ checked_on_boot => 0,
automatic => 1,
},
@@ -118,7 +118,7 @@ our @tree =
icon => "cd.png",
configurator => "",
detector => sub { f(grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms()) },
- checked_on_boot => 1,
+ checked_on_boot => 0,
automatic => 1,
},