summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-04-05 11:05:57 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-04-05 11:05:57 +0000
commitbde5bfd56dd990e7a3cf042a7f68ab4bbd5ab557 (patch)
tree331e81b3f8afce1cfbcb121b6ac16109a8b3c943
parent861a2b18f5481d43125e0a2b383f5b9746915f75 (diff)
downloaddrakx-bde5bfd56dd990e7a3cf042a7f68ab4bbd5ab557.tar
drakx-bde5bfd56dd990e7a3cf042a7f68ab4bbd5ab557.tar.gz
drakx-bde5bfd56dd990e7a3cf042a7f68ab4bbd5ab557.tar.bz2
drakx-bde5bfd56dd990e7a3cf042a7f68ab4bbd5ab557.tar.xz
drakx-bde5bfd56dd990e7a3cf042a7f68ab4bbd5ab557.zip
(setDefaultPackages) install alsa-utils if *any* of the present sound card is driven by ALSA
-rw-r--r--perl-install/install_any.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 3f49ee36a..e93664e0c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -329,8 +329,7 @@ sub setDefaultPackages {
push @{$o->{default_packages}}, "numlock" if $o->{miscellaneous}{numlock};
push @{$o->{default_packages}}, "raidtools" if !is_empty_array_ref($o->{all_hds}{raids});
push @{$o->{default_packages}}, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms});
- # BUG: if first snd card is managed by OSS and the second one by alsa, we do not install alsa-utils:
- push @{$o->{default_packages}}, "alsa", "alsa-utils" if modules::get_alias("sound-slot-0") =~ /^snd-/;
+ push @{$o->{default_packages}}, "alsa", "alsa-utils" if find { modules::get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4;
push @{$o->{default_packages}}, "grub" if isLoopback(fsedit::get_root($o->{fstab}));
push @{$o->{default_packages}}, uniq(grep { $_ } map { fsedit::package_needed_for_partition_type($_) } @{$o->{fstab}});