diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-11-21 12:56:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-11-21 12:56:48 +0000 |
| commit | b8a069fc247e34fff755ae64bd33423fcee62fa1 (patch) | |
| tree | 157e70228f674278bc85f05c76fe182359c4a237 | |
| parent | d3ad34d44d95c630499a0c2fff717b204e18361d (diff) | |
| download | drakx-backup-do-not-use-b8a069fc247e34fff755ae64bd33423fcee62fa1.tar drakx-backup-do-not-use-b8a069fc247e34fff755ae64bd33423fcee62fa1.tar.gz drakx-backup-do-not-use-b8a069fc247e34fff755ae64bd33423fcee62fa1.tar.bz2 drakx-backup-do-not-use-b8a069fc247e34fff755ae64bd33423fcee62fa1.tar.xz drakx-backup-do-not-use-b8a069fc247e34fff755ae64bd33423fcee62fa1.zip | |
install aoss too when installing ALSA
| -rw-r--r-- | perl-install/harddrake/sound.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/rpmsrate | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 5d1b2a81b..ff5a74362 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -200,7 +200,7 @@ sub do_switch { $modules_conf->set_sound_slot("sound-slot-$index", $new_driver); $modules_conf->write; if ($new_driver =~ /^snd-/) { # new driver is an alsa one - $in->do_pkgs->ensure_binary_is_installed('alsa-utils', 'alsactl'); + $in->do_pkgs->ensure_binary_is_installed(qw(alsactl alsa-utils aoss)); rooted("service alsa start") if $::isStandalone && !$blacklisted; rooted("/sbin/chkconfig --add alsa") if $::isStandalone; load($modules_conf, $new_driver) if $::isStandalone; # service alsa is buggy diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 22ad2e00b..bc1c4294c 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -895,7 +895,7 @@ sub default_packages { push @l, "mdadm" if !is_empty_array_ref($o->{all_hds}{raids}); push @l, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms}); push @l, "dmraid" if any { fs::type::is_dmraid($_) } @{$o->{all_hds}{hds}}; - push @l, "alsa-utils" if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4; + push @l, qw(alsa-utils oss) if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4; push @l, (arch() =~ /x86_64/ ? 'powernowd' : 'athcool') if cat_('/proc/cpuinfo') =~ /AuthenticAMD/; push @l, detect_devices::probe_name('Pkg'); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index fffc4b81d..ec0b47af0 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1038,7 +1038,7 @@ sub summary { val => sub {}, clicked => sub { if ($o->ask_yesorno('', N("Do you have an ISA sound card?"))) { - $o->do_pkgs->install(qw(alsa-utils sndconfig)); + $o->do_pkgs->install(qw(alsa-utils sndconfig aoss)); $o->ask_warn('', N("Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card")); } else { $o->ask_warn('', N("No sound card detected. Try \"harddrake\" after installation")); diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate index df8ffe562..6f3187ecd 100644 --- a/perl-install/share/rpmsrate +++ b/perl-install/share/rpmsrate @@ -117,7 +117,7 @@ CAT_AUDIO 3 CAT_KDE kdemultimedia-noatun 3 timidity-instruments 3 beep-media-player - 5 DRIVER"^snd-" alsa-utils + 5 DRIVER"^snd-" alsa-utils aoss 4 DRIVER"^snd-" xmms-alsa gstreamer-alsa # the two following entries are for ISA sound cards and thus are not managed for now: 5 DRIVER"^snd-sb" cspctl @@ -765,7 +765,7 @@ INSTALL NOCOPY 5 kernel kernel-smp kernel-i686-up-4GB mdadm lvm2 reiserfsprogs jfsprogs xfsprogs - alsa-utils xorg-x11 xorg-x11-server + alsa-utils aoss xorg-x11 xorg-x11-server ik8utils toshutils 4 brltty |