summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-05-30 02:57:48 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-05-30 02:57:48 +0000
commitd8a1d8a051bd6dd1a75ffe1a61ff6ac7110abeca (patch)
tree3f1c7b5a366ef7048eb2d86ac1289228e7b69a4b /perl-install
parent54a40cf7adffd4eff2a7084e710f01d90cee17aa (diff)
downloaddrakx-d8a1d8a051bd6dd1a75ffe1a61ff6ac7110abeca.tar
drakx-d8a1d8a051bd6dd1a75ffe1a61ff6ac7110abeca.tar.gz
drakx-d8a1d8a051bd6dd1a75ffe1a61ff6ac7110abeca.tar.bz2
drakx-d8a1d8a051bd6dd1a75ffe1a61ff6ac7110abeca.tar.xz
drakx-d8a1d8a051bd6dd1a75ffe1a61ff6ac7110abeca.zip
(write_preload_conf) simplify DVB & TV managment through probe_category()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/modules.pm3
1 files changed, 1 insertions, 2 deletions
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');