summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-10-18 22:35:16 +0200
committerPascal Terjan <pterjan@gmail.com>2014-10-20 21:48:56 +0000
commit87190ddc569907e957ef1f7603e053e1d8911e06 (patch)
tree65c1ac3b5c754bf9970b3f81646defe74ca40d77
parent9e41003ebe5ee7256b5aed88d512e4042d64342a (diff)
downloaddrakx-87190ddc569907e957ef1f7603e053e1d8911e06.tar
drakx-87190ddc569907e957ef1f7603e053e1d8911e06.tar.gz
drakx-87190ddc569907e957ef1f7603e053e1d8911e06.tar.bz2
drakx-87190ddc569907e957ef1f7603e053e1d8911e06.tar.xz
drakx-87190ddc569907e957ef1f7603e053e1d8911e06.zip
draksound: Kill off some old, no longer present services.
We should probably rip out a lot more here (i.e. we should really not need to do any sound slot config these days in modprobe.conf)
-rw-r--r--perl-install/harddrake/sound.pm13
1 files changed, 3 insertions, 10 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 520402cb8..e7acf25dc 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -77,9 +77,7 @@ sub do_switch {
my $_wait = $in->wait_message(N("Please wait"), N("Please Wait... Applying the configuration"));
log::explanations("removing old $old_driver\n");
if ($::isStandalone) {
- rooted("service sound stop");
- rooted("service alsa stop") if $old_driver =~ /^snd_/;
- unload($old_driver); # run_program("/sbin/modprobe -r $driver"); # just in case ...
+ unload($old_driver); # run_program("/sbin/modprobe -r $driver");
}
$modules_conf->remove_module($old_driver);
configure_one_sound_slot($modules_conf, $index, $new_driver);
@@ -87,13 +85,8 @@ sub do_switch {
if ($new_driver =~ /^snd_/) { # new driver is an alsa one
$in->do_pkgs->ensure_binary_is_installed(qw(alsa-utils alsactl), 1);
$in->do_pkgs->ensure_binary_is_installed(qw(aoss aoss), 1);
- rooted("service alsa start") if $::isStandalone;
- rooted("/sbin/chkconfig --add alsa") if $::isStandalone;
- load($modules_conf, $new_driver) if $::isStandalone; # service alsa is buggy
- } else { rooted("/sbin/chkconfig --del alsa") }
- log::explanations("loading new $new_driver\n");
- rooted("/sbin/chkconfig --add sound"); # just in case ...
- rooted("service sound start") if $::isStandalone;
+ load($modules_conf, $new_driver) if $::isStandalone;
+ }
}
sub config {