summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-24 08:43:25 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-24 08:43:25 +0000
commit921010e675eaebd97ed12f7926529dd44c271104 (patch)
tree594502c7ec0ee8f1909765b082ea345b979ca57d
parent4314301581699eddbde71492da375f0cee70fcc4 (diff)
downloaddrakx-921010e675eaebd97ed12f7926529dd44c271104.tar
drakx-921010e675eaebd97ed12f7926529dd44c271104.tar.gz
drakx-921010e675eaebd97ed12f7926529dd44c271104.tar.bz2
drakx-921010e675eaebd97ed12f7926529dd44c271104.tar.xz
drakx-921010e675eaebd97ed12f7926529dd44c271104.zip
in modules::when_load, try to find the best sound slot index instead of always overwritting sound-slot-0 (#7890)
-rw-r--r--perl-install/modules.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index cb4d2ae2e..929399c15 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -433,7 +433,11 @@ sub when_load {
add_probeall('scsi_hostadapter', $name);
eval { load('sd_mod') };
}
- add_alias('sound-slot-0', $name) if $category =~ /sound/;
+ if ($category =~ /sound/) {
+ my $sound_alias = find { /^sound-slot-[0-9]+$/ and $conf{$_}{alias} eq $module } keys %conf;
+ $sound_alias ||= 'sound-slot-0';
+ add_alias($sound_alias, $name);
+ }
}
}