summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-20 13:22:11 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-20 13:22:11 +0000
commitfdc0a227e05fb6b517432208d3af98ebb00e491e (patch)
tree858c846d8d1b7dd30297d8912010f7cdc9310fa5
parentedf5ca0403c4626e6b3d8a30fe80c17e592e9983 (diff)
downloaddrakx-fdc0a227e05fb6b517432208d3af98ebb00e491e.tar
drakx-fdc0a227e05fb6b517432208d3af98ebb00e491e.tar.gz
drakx-fdc0a227e05fb6b517432208d3af98ebb00e491e.tar.bz2
drakx-fdc0a227e05fb6b517432208d3af98ebb00e491e.tar.xz
drakx-fdc0a227e05fb6b517432208d3af98ebb00e491e.zip
fix listing DVD/CD as them and as unknown (#33366)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm6
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f73ffedbd..ab926a06b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- drakboot:
o create .dmrc with mode 0644 for gdm (#33774)
- harddrake:
+ o fix listing DVD/CD as them and as unknown (#33366)
o stop offering to run drakxtv
Version 10.4.203 - 19 September 2007, by Thierry Vignaud
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 0ef9f03e6..8d5c50637 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -97,7 +97,7 @@ our @tree =
string => N("CDROM"),
icon => "cd.png",
configurator => "",
- detector => sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms },
+ detector => sub { f(grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms) },
checked_on_boot => 1,
automatic => 1,
},
@@ -107,7 +107,7 @@ our @tree =
string => N("CD/DVD burners"),
icon => "cd.png",
configurator => "",
- detector => \&detect_devices::burners,
+ detector => sub { f(detect_devices::burners()) },
checked_on_boot => 1,
automatic => 1,
},
@@ -117,7 +117,7 @@ our @tree =
string => N("DVD-ROM"),
icon => "cd.png",
configurator => "",
- detector => sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms() },
+ detector => sub { f(grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms()) },
checked_on_boot => 1,
automatic => 1,
},