From d8a1d8a051bd6dd1a75ffe1a61ff6ac7110abeca Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 30 May 2005 02:57:48 +0000
Subject: (write_preload_conf) simplify DVB & TV managment through
 probe_category()

---
 perl-install/modules.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'perl-install/modules.pm')

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 2735d09ea..f35a44b93 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -188,8 +188,7 @@ sub write_preload_conf {
     my ($conf) = @_;
     my @l;
     push @l, 'scsi_hostadapter' if $conf->get_probeall('scsi_hostadapter');
-    push @l, intersection([ list_modules::category2modules('multimedia/dvb'), list_modules::category2modules('multimedia/tv') ],
-			  [ map { $_->{driver} } detect_devices::probeall() ]);
+    push @l, map { $_->{driver} } probe_category($_) foreach qw(multimedia/dvb multimedia/tv);
     push @l, map { if_($_->{driver} =~ /^Module:(.*)/, $1) } detect_devices::probeall();
     push @l, 'nvram' if detect_devices::isLaptop();
     push @l, map { $_->{driver} } probe_category('various/laptop');
-- 
cgit v1.2.1