summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-22 20:47:46 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-22 20:47:46 +0000
commit41489d12255281803fe313a2acafa9c0d300f37f (patch)
tree8aa6ccaa51c8f5c21ce152b2c38cdf4fcb2adb1d /perl-install
parent25d260aeaf8796c95ac1b7aedf8f45924c6b2d88 (diff)
downloaddrakx-backup-do-not-use-41489d12255281803fe313a2acafa9c0d300f37f.tar
drakx-backup-do-not-use-41489d12255281803fe313a2acafa9c0d300f37f.tar.gz
drakx-backup-do-not-use-41489d12255281803fe313a2acafa9c0d300f37f.tar.bz2
drakx-backup-do-not-use-41489d12255281803fe313a2acafa9c0d300f37f.tar.xz
drakx-backup-do-not-use-41489d12255281803fe313a2acafa9c0d300f37f.zip
draksound doesn't write the sound alias b/c of wrong comparison with the
default driver, thus not configuring not yet configured cards (#6988)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/sound.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 63ca1f0f0..2e5ea7348 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -214,12 +214,12 @@ To use alsa, one can either use:
&get_any_driver_entry($in, $driver, $device),
]))
{
- return if $new_driver eq $driver;
- log::explanations("switching audio driver from '$driver' to '$new_driver'\n");
+ return if $new_driver eq $device->{current_driver};
+ log::explanations("switching audio driver from '" . $device->{current_driver} . "' to '$new_driver'\n");
$in->ask_warn(N("Warning"), N("The old \"%s\" driver is blacklisted.\n
It has been reported to oops the kernel on unloading.\n
-The new \"%s\" driver'll only be used on next bootstrap.", $driver, $new_driver)) if $blacklisted;
- do_switch($in, $driver, $new_driver, $device->{sound_slot_index});
+The new \"%s\" driver'll only be used on next bootstrap.", $device->{current_driver}, $new_driver)) if $blacklisted;
+ do_switch($in, $device->{current_driver}, $new_driver, $device->{sound_slot_index});
$device->{current_driver} = $new_driver;
}
} elsif ($driver =~ /^Bad:/) {