diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-08 01:21:42 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-08 01:21:42 +0000 |
| commit | 149bb85110e0f6de5f16d8acbb636644c4fb114d (patch) | |
| tree | 73a8d37d44e3e7f436118d7d62d353b8111f2324 /perl-install/harddrake/sound.pm | |
| parent | 0dbe0e74dd84b15f5949035455e3ef1fa568b728 (diff) | |
| download | drakx-backup-do-not-use-149bb85110e0f6de5f16d8acbb636644c4fb114d.tar drakx-backup-do-not-use-149bb85110e0f6de5f16d8acbb636644c4fb114d.tar.gz drakx-backup-do-not-use-149bb85110e0f6de5f16d8acbb636644c4fb114d.tar.bz2 drakx-backup-do-not-use-149bb85110e0f6de5f16d8acbb636644c4fb114d.tar.xz drakx-backup-do-not-use-149bb85110e0f6de5f16d8acbb636644c4fb114d.zip | |
- rename add_alias() into set_alias()
- create set_sound_slot() and use it
Diffstat (limited to 'perl-install/harddrake/sound.pm')
| -rw-r--r-- | perl-install/harddrake/sound.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 9796e7e7f..94f3ac5f9 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -154,8 +154,8 @@ sub do_switch { rooted("service alsa stop") if $old_driver =~ /^snd-/ && !$blacklisted; unload($old_driver); # run_program("/sbin/modprobe -r $driver"); # just in case ... } - modules::remove_module($old_driver); # completed by the next add_alias() - modules::add_alias("sound-slot-$index", $new_driver); + modules::remove_module($old_driver); + modules::set_sound_slot("sound-slot-$index", $new_driver); modules::write_conf(); if ($new_driver =~ /^snd-/) { # new driver is an alsa one $in->do_pkgs->ensure_is_installed('alsa-utils', '/usr/sbin/alsactl'); @@ -307,7 +307,7 @@ sub configure_sound_slots() { my $default_driver = modules::get_alias("sound-slot-$::i"); if (!member($default_driver, @{get_alternative($_->{driver})}, $_->{driver})) { $altered ||= $default_driver; - modules::add_alias("sound-slot-$::i", $_->{driver}); + modules::set_sound_slot("sound-slot-$::i", $_->{driver}); } } detect_devices::getSoundDevices(); modules::write_conf() if $altered && $::isStandalone; |